[gentoo-commits] proj/portage:master commit in: cnf/

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     8f677b5e1d7c8e41c4b677b4cf802b1e8ab21a69
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 05:24:10 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 05:24:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8f677b5e

etc-update: disable clear_term by default

---
 cnf/etc-update.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf
index 6f69dee..cea2173 100644
--- a/cnf/etc-update.conf
+++ b/cnf/etc-update.conf
@@ -6,7 +6,8 @@
 mode="0"
 
 # Whether to clear the term prior to each display
-clear_term="yes"
+#clear_term="yes"
+clear_term="no"
 
 # Whether trivial/comment changes should be automerged
 eu_automerge="yes"

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     e9251b4c51c580410695fae107d161c1147c9f88
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 03:44:58 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 03:44:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e9251b4c

Add a copy of metadata.dtd, for repoman tests.

Since repoman uses metadata.dtd for metadata.xml checks, our sources
need to include a copy in order to test it.

---
 cnf/metadata.dtd |   99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 99 insertions(+), 0 deletions(-)

diff --git a/cnf/metadata.dtd b/cnf/metadata.dtd
new file mode 100644
index 0000000..d97642a
--- /dev/null
+++ b/cnf/metadata.dtd
@@ -0,0 +1,99 @@
+<!ELEMENT packages ( pkgmetadata* )>
+
+<!-- Metadata for a category -->
+<!ELEMENT catmetadata ( (longdescription)* )>
+<!ATTLIST catmetadata pkgname CDATA "">
+
+<!-- Metadata for a package -->
+<!ELEMENT pkgmetadata ( (herd|maintainer|longdescription|use|upstream)* )>
+<!ATTLIST pkgmetadata pkgname CDATA "">
+
+  <!-- One tag for each herd this package is assigned to. -->
+  <!ELEMENT herd (#PCDATA)>
+
+  <!-- One tag for each maintainer of a package, multiple allowed-->
+  <!ELEMENT maintainer ( email, (description| name)* )>
+
+  <!-- A long description of the package in freetext-->
+  <!ELEMENT longdescription (#PCDATA|pkg|cat)* >
+
+  <!-- The changelog of the package-->
+  <!-- Please note that #PCDATA is mentioned only for the upstream changelog
+    element, where the content is a URL. This is due to limitations of the DTD -->
+  <!ELEMENT changelog (#PCDATA|change)* >
+    <!-- The changelog contains various "changes"-->
+    <!ELEMENT change (date,(developer|version|description|file|contributor|bug)*) >
+      <!ELEMENT date (#PCDATA) >
+        <!-- The date of the change, in "YYYY-MM-DD" format -->
+      <!ELEMENT developer (name?,email) >
+        <!-- The developer that made the change. The email is required, name
+	   is optional-->
+      <!ELEMENT version (#PCDATA) >
+        <!--version of the packages involved (one tag per version)-->
+      <!ELEMENT file (#PCDATA) ><!-- one tag per file touched -->
+      <!ELEMENT contributor (name?,email?) >
+        <!-- A reference to a user that helped in causing this change. 
+          There should at least be a name or email address included. 
+          Email is preferred -->
+      <!ELEMENT bug (#PCDATA) >
+        <!-- bug-id of a bug fixed by this change, multiple allowed. The 
+          format of this is a number or alias for a bug. NOT including a 
+          # character -->
+
+  <!-- description of what this USE flag does for this package -->
+  <!ELEMENT use (flag)* >
+    <!ELEMENT flag (#PCDATA|pkg|cat)* >
+      <!-- name attribute holds the name of the USE flag -->
+      <!ATTLIST flag name CDATA #REQUIRED >
+
+  <!-- upstream metadata information (maintainers, upstream docs,..) -->
+  <!ELEMENT upstream (maintainer|changelog|doc|bugs-to|remote-id)* >
+    <!-- Due to the limitation of DTD this will also allow a status
+      attribute for the package maintainer element. Please note that
+      the usage of the status attribute is nevertheless _only_ allowed
+      in the upstream maintainer element. -->
+    <!ATTLIST maintainer status (active|inactive|unknown) "unknown" >
+    <!-- URL where the location of the upstream documentation can be found -->
+    <!ELEMENT doc (#PCDATA)>
+      <!ATTLIST doc lang CDATA "C" >
+    <!-- location where to report bugs
+      (may also be an email address prefixed with mailto:) -->
+    <!ELEMENT bugs-to (#PCDATA)>
+    <!-- specify a type of package identification tracker -->
+    <!ELEMENT remote-id (#PCDATA)>
+      <!ATTLIST remote-id type (freshmeat|sourceforge|sourceforge-jp|cpan|vim|google-code|ctan|pypi|rubyforge|cran) #REQUIRED>
+
+  <!-- category/package information for cross-linking in descriptions
+    and useflag descriptions -->
+  <!ELEMENT pkg (#PCDATA) >
+  <!ELEMENT cat (#PCDATA) >
+          
+<!-- Common attributes -->
+
+<!-- the lang attribute, specifies the language of this tag. This is 
+  only useful for descriptions of various kinds. If a tag with this 
+  attribute is included there must be a description in the default 
+  language "C" or "en", which is equivalent -->
+  <!ATTLIST description lang CDATA "C" >
+  <!ATTLIST longdescription lang CDATA "C" >
+  <!ATTLIST use lang CDATA "C" >
+
+<!-- The restrict attribute, this attribute specifies restrictions on 
+  the applicability of tags on versions. The format of this attribute is 
+  equal to the format of DEPEND lines in ebuilds. There is one special 
+  value though: restrict="*". A tag that specifies this only applies if 
+  there are no other tags that apply.
+  
+  For required tags, there must be either an unrestricted version, or a 
+  version that is default restricted. -->
+  <!ATTLIST herd restrict CDATA #IMPLIED >
+  <!ATTLIST maintainer restrict CDATA #IMPLIED >
+  <!ATTLIST longdescription restrict CDATA #IMPLIED >
+  <!ATTLIST flag restrict CDATA #IMPLIED >
+
+
+
+<!-- standard parts -->
+<!ELEMENT email (#PCDATA) ><!-- an email address -->
+<!ELEMENT name (#PCDATA) ><!-- the name of a person (maintainer, contributor)-->
+<!ELEMENT description (#PCDATA) ><!-- A description of a maintainer or change-->

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     57dca075caa03d701b02da68e894e2aec9606db2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 21:23:46 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 21:23:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=57dca075

make.conf: sync PORTAGE_ELOG_SYSTEM example

Synchronize the PORTAGE_ELOG_SYSTEM example with the default
make.globals setting.

---
 cnf/make.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnf/make.conf b/cnf/make.conf
index 3d96fb4..9d03892 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -305,7 +305,7 @@ PORTAGE_ELOG_CLASSES="log warn error"
 #                      separated list of loglevels to override PORTAGE_ELOG_CLASSES
 #                      for this module (e.g.
 #                        PORTAGE_ELOG_SYSTEM="mail:warn,error syslog:* save")
-#PORTAGE_ELOG_SYSTEM="save mail"
+#PORTAGE_ELOG_SYSTEM="save_summary echo"
 
 # PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
 #                      to process log messages. Two variables are expanded:

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     ca73a3a6e6fe386d90068e0fb5187c395e8ae0ed
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 21:45:24 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 21:45:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ca73a3a6

cnf/make.conf: fix ia64 and s390 diffs

---
 cnf/make.conf.ia64.diff |   23 ++++-------------------
 cnf/make.conf.s390.diff |   23 ++++-------------------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/cnf/make.conf.ia64.diff b/cnf/make.conf.ia64.diff
index a612707..3b144d7 100644
--- a/cnf/make.conf.ia64.diff
+++ b/cnf/make.conf.ia64.diff
@@ -1,6 +1,6 @@
---- make.conf	2006-03-19 18:40:11.000000000 +0100
-+++ make.conf.ia64	2006-03-19 18:26:21.000000000 +0100
-@@ -23,20 +23,18 @@
+--- make.conf
++++ make.conf.ia64
+@@ -22,6 +22,13 @@
  # Example:
  #USE="X gtk gnome -alsa"
  
@@ -14,22 +14,7 @@
  # Host and optimization settings 
  # ==============================
  #
--# For optimal performance, enable a CFLAGS setting appropriate for your CPU.
--#
--# Please note that if you experience strange issues with a package, it may be
--# due to gcc's optimizations interacting in a strange way. Please test the
--# package (and in some cases the libraries it uses) at default optimizations
--# before reporting errors to developers.
--#
--# Please refer to the GCC manual for a list of possible values.
--#
- #CFLAGS="-O2 -pipe"
--#
-+
- # If you set a CFLAGS above, then this line will set your default C++ flags to
- # the same settings.
- #CXXFLAGS="${CFLAGS}"
-@@ -61,7 +80,7 @@
+@@ -75,7 +82,7 @@
  # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
  # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
  #

diff --git a/cnf/make.conf.s390.diff b/cnf/make.conf.s390.diff
index b2514d5..2acb085 100644
--- a/cnf/make.conf.s390.diff
+++ b/cnf/make.conf.s390.diff
@@ -1,6 +1,6 @@
---- make.conf	2006-03-19 18:40:11.000000000 +0100
-+++ make.conf.s390	2006-03-19 18:26:21.000000000 +0100
-@@ -23,20 +23,18 @@
+--- make.conf
++++ make.conf.s390
+@@ -22,6 +22,13 @@
  # Example:
  #USE="X gtk gnome -alsa"
  
@@ -14,22 +14,7 @@
  # Host and optimization settings 
  # ==============================
  #
--# For optimal performance, enable a CFLAGS setting appropriate for your CPU.
--#
--# Please note that if you experience strange issues with a package, it may be
--# due to gcc's optimizations interacting in a strange way. Please test the
--# package (and in some cases the libraries it uses) at default optimizations
--# before reporting errors to developers.
--#
--# Please refer to the GCC manual for a list of possible values.
--#
- #CFLAGS="-O2 -pipe"
--#
-+
- # If you set a CFLAGS above, then this line will set your default C++ flags to
- # the same settings.
- #CXXFLAGS="${CFLAGS}"
-@@ -61,7 +80,7 @@
+@@ -75,7 +82,7 @@
  # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
  # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
  #

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     e1c6bba8c26525cca498894237c6421f86c98dfb
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 04:22:18 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 04:22:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e1c6bba8

make.globals: don't define PORTDIR with EPREFIX

We want make.globals defaults to evaluate the same, regardless of
the current prefix that we're using it for (bug #395633).

---
 cnf/make.globals |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index cd06fdc..8578585 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -30,7 +30,7 @@ ACCEPT_LICENSE="* -@EULA"
 ACCEPT_PROPERTIES="*"
 
 # Repository Paths
-PORTDIR=${EPREFIX}/usr/portage
+PORTDIR=/usr/portage
 DISTDIR=${PORTDIR}/distfiles
 PKGDIR=${PORTDIR}/packages
 RPMDIR=${PORTDIR}/rpm

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     9164879113f6ac42bdec498739fbae2ce6af9ae3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 04:29:51 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 04:29:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=91648791

make.globals: don't define TMPDIR with EPREFIX

Same reason as commit e1c6bba8c26525cca498894237c6421f86c98dfb.

---
 cnf/make.globals |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 8578585..fade448 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -36,7 +36,7 @@ PKGDIR=${PORTDIR}/packages
 RPMDIR=${PORTDIR}/rpm
 
 # Temporary build directory
-PORTAGE_TMPDIR=${EPREFIX}/var/tmp
+PORTAGE_TMPDIR=/var/tmp
 
 # Fetching command (3 tries, passive ftp for firewall compatibility)
 FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     e9adbc89be9ea37fef0a16978d643078703e0f06
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat May  5 16:37:51 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat May  5 16:40:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e9adbc89

COLLISION_IGNORE_UNOWNED: tweak default *.py[co]

---
 cnf/make.globals |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 5f536c3..fa76c09 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -64,7 +64,7 @@ COLLISION_IGNORE="/lib/modules"
 # Ignore file collisions for unowned *.pyo and *.pyc files, this helps during
 # transition from compiling python modules in live file system to compiling
 # them in src_install() function.
-COLLISION_IGNORE_UNOWNED="*.pyc *.pyo"
+COLLISION_IGNORE_UNOWNED="*.py[co]"
 
 # Enable preserve-libs for testing with portage versions that support it.
 # This setting is commented out for portage versions that don't support it.

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     138e6030a70ca3ffe4f2da8fa9f8f5a913e0ccd8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  6 06:43:43 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jul  6 06:43:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=138e6030

PORTAGE_GPG_SIGNING_COMMAND: --digest-algo SHA512

---
 cnf/make.globals |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index c354291..db97d8b 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -128,7 +128,7 @@ PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
 PORTAGE_ELOG_MAILFROM="portage@localhost"
 
 # Signing command used by repoman
-PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
+PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA512 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     c0bfa14ff884cd956440984a9bb7bf59b88f696d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 21:03:01 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 21:03:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c0bfa14f

PORTAGE_GPG_SIGNING_COMMAND: --digest-algo SHA256

---
 cnf/make.globals |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index db97d8b..ada91f8 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -128,7 +128,7 @@ PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
 PORTAGE_ELOG_MAILFROM="portage@localhost"
 
 # Signing command used by repoman
-PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA512 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
+PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA256 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     3e853835a8097fe80866ebe7d6666cdbb132683b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 17:45:28 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 17:45:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3e853835

make.conf: clarify -frecord-gcc-switches

---
 cnf/make.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cnf/make.conf b/cnf/make.conf
index 5ee1cd3..ad2a5b7 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -33,7 +33,8 @@
 # before reporting errors to developers.
 #
 # If your gcc supports it, you can add -frecord-gcc-switches to all of the
-# following *FLAGS in order to enable *FLAGS ignorance checking for ebuilds.
+# following *FLAGS in order to enable *FLAGS ignorance checking for ebuilds:
+# CFLAGS, CXXFLAGS, FFLAGS, and FCFLAGS.
 # Note that this check is only enabled if every one of these variables contains
 # -frecord-gcc-switches, since otherwise the check could result in false
 # positive results.

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     e88d8b8a89a895b646e7d18ad9d6893165978644
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 08:13:03 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 08:13:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e88d8b8a

elog: enable save_summary:qa by default

QA warnings still won't be echoed by default, but they will be saved in
summary.log.

---
 cnf/make.conf    |    2 +-
 cnf/make.globals |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cnf/make.conf b/cnf/make.conf
index ad2a5b7..7dcfbb9 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -312,7 +312,7 @@ PORTAGE_ELOG_CLASSES="log warn error"
 #                      separated list of loglevels to override PORTAGE_ELOG_CLASSES
 #                      for this module (e.g.
 #                        PORTAGE_ELOG_SYSTEM="mail:warn,error syslog:* save")
-#PORTAGE_ELOG_SYSTEM="save_summary echo"
+#PORTAGE_ELOG_SYSTEM="save_summary:log,warn,error,qa echo"
 
 # PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
 #                      to process log messages. Two variables are expanded:

diff --git a/cnf/make.globals b/cnf/make.globals
index ada91f8..ce35554 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -121,7 +121,7 @@ PORTAGE_WORKDIR_MODE="0700"
 
 # Some defaults for elog
 PORTAGE_ELOG_CLASSES="log warn error"
-PORTAGE_ELOG_SYSTEM="save_summary echo"
+PORTAGE_ELOG_SYSTEM="save_summary:log,warn,error,qa echo"
 
 PORTAGE_ELOG_MAILURI="root"
 PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     603cb116f857b59fd0f5ec04c5e0bce3db4b4f5d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 21:35:00 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 21:35:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=603cb116

metadata.dtd: update to latest

---
 cnf/metadata.dtd |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cnf/metadata.dtd b/cnf/metadata.dtd
index d97642a..bd83066 100644
--- a/cnf/metadata.dtd
+++ b/cnf/metadata.dtd
@@ -5,7 +5,7 @@
 <!ATTLIST catmetadata pkgname CDATA "">
 
 <!-- Metadata for a package -->
-<!ELEMENT pkgmetadata ( (herd|maintainer|longdescription|use|upstream)* )>
+<!ELEMENT pkgmetadata ( (herd|maintainer|natural-name|longdescription|use|upstream)* )>
 <!ATTLIST pkgmetadata pkgname CDATA "">
 
   <!-- One tag for each herd this package is assigned to. -->
@@ -14,6 +14,9 @@
   <!-- One tag for each maintainer of a package, multiple allowed-->
   <!ELEMENT maintainer ( email, (description| name)* )>
 
+  <!-- Natural name for package, example: LibreOffice (for app-office/libreoffice) -->
+  <!ELEMENT natural-name (#PCDATA) >
+
   <!-- A long description of the package in freetext-->
   <!ELEMENT longdescription (#PCDATA|pkg|cat)* >
 
@@ -61,7 +64,7 @@
     <!ELEMENT bugs-to (#PCDATA)>
     <!-- specify a type of package identification tracker -->
     <!ELEMENT remote-id (#PCDATA)>
-      <!ATTLIST remote-id type (freshmeat|sourceforge|sourceforge-jp|cpan|vim|google-code|ctan|pypi|rubyforge|cran) #REQUIRED>
+      <!ATTLIST remote-id type (bitbucket|cpan|cpan-module|cran|ctan|freshmeat|github|gitorious|google-code|launchpad|pear|pecl|pypi|rubyforge|rubygems|sourceforge|sourceforge-jp|vim) #REQUIRED>
 
   <!-- category/package information for cross-linking in descriptions
     and useflag descriptions -->

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     40c0d7c86f83ff9a1507d030ffc29697df0e3274
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  6 20:06:12 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep  6 20:06:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=40c0d7c8

dispatch-conf.conf: say install rcs, bug #380551

---
 cnf/dispatch-conf.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf
index 7eea44c..125b7cc 100644
--- a/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@ -6,6 +6,7 @@
 archive-dir=${EPREFIX}/etc/config-archive
 
 # Use rcs for storing files in the archive directory?
+# NOTE: You should install dev-vcs/rcs before enabling this option.
 # WARNING: When configured to use rcs, read and execute permissions of
 # archived files may be inherited from the first check in of a working
 # file, as documented in the ci(1) man page. This means that even if

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     b7bab7e4ba071e2a23d124b476698fd12741c4c4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  5 08:32:05 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov  5 08:51:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b7bab7e4

COLLISION_IGNORE jython compiled modules as well.

Jython names its compiled modules *$py.class.

---
 cnf/make.globals |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 47ee787..80a68f7 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -63,7 +63,7 @@ FEATURES="assume-digests binpkg-logs
 # Ignore file collisions for unowned *.pyo and *.pyc files, this helps during
 # transition from compiling python modules in live file system to compiling
 # them in src_install() function.
-COLLISION_IGNORE="/lib/modules/* *.py[co]"
+COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class"
 UNINSTALL_IGNORE="/lib/modules/*"
 
 # By default wait 5 secs before cleaning a package

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     8505c564ba0e90830a8ae0e2a3d06e5d6beb8f64
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 16:48:04 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 16:48:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8505c564

make.conf.example: remove obsolete warning

---
 cnf/make.conf |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/cnf/make.conf b/cnf/make.conf
index 7a6bff5..cc76d13 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -289,8 +289,7 @@
 # logging related variables:
 # PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
 #                          info, warn, error, log, qa, *
-#                       Warning: commenting this will disable elog
-PORTAGE_ELOG_CLASSES="log warn error"
+#PORTAGE_ELOG_CLASSES="log warn error"
 
 # PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
 #                      included in portage are (empty means logging is disabled):

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     24e65d4490c9650bc446cf342a2fc04326d17fb8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 15:30:53 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 16:51:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=24e65d44

make.conf: example for ACCEPT_LICENSE

---
 cnf/make.conf |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/cnf/make.conf b/cnf/make.conf
index cc76d13..b90d615 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -78,6 +78,18 @@
 #
 #ACCEPT_KEYWORDS="~arch"
 
+# ACCEPT_LICENSE is used to mask packages based on licensing restrictions.
+# It may contain both license and group names, where group names are
+# prefixed with the '@' symbol. License groups are defined in the
+# license_groups file (see portage(5) man page). In addition to license
+# and group names, the * and -* wildcard tokens are also supported.
+#
+# Accept any license except those in the EULA license group (default).
+#ACCEPT_LICENSE="* -@EULA"
+#
+# Only accept licenses in the FREE license group (i.e. Free Software).
+#ACCEPT_LICENSE="-* @FREE"
+
 # Portage Directories
 # ===================
 #

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     4e408d510fda0f791f5e8e16e5137e424744c329
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 04:09:04 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri May 10 04:09:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4e408d51

metadata.dtd: update to latest

---
 cnf/metadata.dtd |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnf/metadata.dtd b/cnf/metadata.dtd
index bd83066..ff2649c 100644
--- a/cnf/metadata.dtd
+++ b/cnf/metadata.dtd
@@ -64,7 +64,7 @@
     <!ELEMENT bugs-to (#PCDATA)>
     <!-- specify a type of package identification tracker -->
     <!ELEMENT remote-id (#PCDATA)>
-      <!ATTLIST remote-id type (bitbucket|cpan|cpan-module|cran|ctan|freshmeat|github|gitorious|google-code|launchpad|pear|pecl|pypi|rubyforge|rubygems|sourceforge|sourceforge-jp|vim) #REQUIRED>
+      <!ATTLIST remote-id type (bitbucket|cpan|cpan-module|cpe|cran|ctan|freecode|freshmeat|github|gitorious|google-code|launchpad|pear|pecl|pypi|rubyforge|rubygems|sourceforge|sourceforge-jp|vim) #REQUIRED>
 
   <!-- category/package information for cross-linking in descriptions
     and useflag descriptions -->

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     e1f01f4c356c736cf8f2de65185fd6f40aad18fd
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 21:59:59 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 21:59:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e1f01f4c

make.globals: quote paths

---
 cnf/make.globals | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index e291b82..013c556 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -28,12 +28,12 @@ ACCEPT_PROPERTIES="*"
 ACCEPT_RESTRICT="*"
 
 # Miscellaneous paths
-DISTDIR=/usr/portage/distfiles
-PKGDIR=/usr/portage/packages
-RPMDIR=/usr/portage/rpm
+DISTDIR="/usr/portage/distfiles"
+PKGDIR="/usr/portage/packages"
+RPMDIR="/usr/portage/rpm"
 
 # Temporary build directory
-PORTAGE_TMPDIR=/var/tmp
+PORTAGE_TMPDIR="/var/tmp"
 
 # Fetching command (3 tries, passive ftp for firewall compatibility)
 FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     2fcdb5f36face97b4a8ce74831d287bd1dd9c2bf
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  1 20:55:34 2014 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Nov  2 02:53:43 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2fcdb5f3

Add btrfs.* to default PORTAGE_XATTR_EXCLUDE (527636)

In bug #527636 a user reported that install-xattr failed to copy
btrfs.compression attributes when doins was installing a file from
$FILESDIR. It is unlinkly that a package will have a valid use for
btrfs.* attributes when installing files to $D. Therefore, exclude
btrfs.* attributes in order to avoid reports like this in the
future.

X-Gentoo-Bug: 527636
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=527636
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

---
 cnf/make.globals | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 013c556..dd99618 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -122,9 +122,10 @@ PORTAGE_ELOG_MAILFROM="portage@localhost"
 # Signing command used by repoman
 PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA256 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
 
+# btrfs.* attributes are irrelevant, see bug #527636.
 # Security labels are special, see bug #461868.
 # system.nfs4_acl attributes are irrelevant, see bug #475496.
-PORTAGE_XATTR_EXCLUDE="security.* system.nfs4_acl"
+PORTAGE_XATTR_EXCLUDE="btrfs.* security.* system.nfs4_acl"
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     ff3c131aeee6f053a6f9a706c1f1be279696c957
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 10 16:23:52 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 17:51:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ff3c131a

dispatch-conf.conf: less-opts --quit-if-one-screen for bug 501886

Use --quit-if-one-screen instead of --QUIT-AT-EOF, so that less doesn't
quit automatically when the user has scrolled to the bottom.

X-Gentoo-Bug: 501886
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=501886
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

 cnf/dispatch-conf.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf
index 125b7cc..7efce8a 100644
--- a/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@ -31,7 +31,7 @@ diff="diff -Nu '%s' '%s'"
 pager=""
 
 # Default options used if less is the pager
-less-opts="--no-init --QUIT-AT-EOF"
+less-opts="--no-init --quit-if-one-screen"
 
 # Diff for interactive merges.
 # %s output file

[gentoo-commits] proj/portage:master commit in: cnf/

[Brian Dolbec]

commit:     028a0a107d279f12c222e773ce0b598f6fafc680
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 03:08:41 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 00:26:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=028a0a10

Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

Content-Disposition: attachment;
 filename­d-.git-dir-to-excluded-dirs-in-default-PORTAGE_RSY.patch

From b49fba5c16a931d3ab041446dd8aeba4d2403260 Mon Sep 17 00:00:00 2001
From: NP-Hardass <NP-Hardass <AT> gentoo.org>
Date: Sun, 13 Dec 2015 21:20:39 -0500
Subject: [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

Adding the .git dir to the default exclude dirs should have no ill side
effects as rsync is not allowed when .git dirs are present and should,
on the user's side prevent future potential sync issues like those that
we recently experienced.

 cnf/make.globals | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 82d8cc1..836bb5c 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -92,7 +92,7 @@ PORTAGE_RSYNC_RETRIES="-1"
 # Number of seconds rsync will wait before timing out.
 #RSYNC_TIMEOUT="180"
 
-PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
+PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
 
 # The number of days after the last `emerge --sync` that a warning
 # message should be produced.

[gentoo-commits] proj/portage:master commit in: cnf/

[Brian Dolbec]

commit:     d5fe26e92c3a990134f0e660d7fd0f4f8c7ebf11
Author:     Vaibhav Niku <vaibhav.niku <AT> yandex <DOT> com>
AuthorDate: Fri Jan  6 17:52:29 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 17:59:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d5fe26e9

cnf/make.conf.example: Fix incorrect "it's" usage, should be "its"

 cnf/make.conf.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index a3b09b5..04f3a02 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -135,7 +135,7 @@
 #     ${CATEGORY}:${PF}:YYYYMMDD-HHMMSS.log in the directory specified.
 #     If the directory does not exist, it will be created automatically and
 #     group permissions will be applied to it.  If the directory already
-#     exists, portage will not modify it's permissions.
+#     exists, portage will not modify its permissions.
 #PORT_LOGDIR=""
 #
 # PORTDIR_OVERLAY is a directory where local ebuilds may be stored without
@@ -258,7 +258,7 @@
 #PORTAGE_NICENESS=3
 #
 # PORTAGE_IONICE_COMMAND provides a command for portage to call in order to
-#     adjust the io priority of portage and it's subprocesses. Default is
+#     adjust the io priority of portage and its subprocesses. Default is
 #     unset.
 #PORTAGE_IONICE_COMMAND="ionice -c 3 -p \${PID}"
 #

[gentoo-commits] proj/portage:master commit in: cnf/

[Brian Dolbec]

commit:     98f930d4d490dd0daf87e9b4c8192a3ad34a624d
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 17:51:11 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 17:58:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=98f930d4

cnf/make.conf.example: Whitespace cleanup

 cnf/make.conf.example | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index 1df3093..a3b09b5 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -22,7 +22,7 @@
 # Example:
 #USE="X gtk gnome -alsa"
 
-# Host and optimization settings 
+# Host and optimization settings
 # ==============================
 #
 # For optimal performance, enable a CFLAGS setting appropriate for your CPU.
@@ -143,7 +143,7 @@
 #     defined.
 #PORTDIR_OVERLAY=/usr/local/portage
 
-# Fetching files 
+# Fetching files
 # ==============
 #
 # If you need to set a proxy for wget or lukemftp, add the appropriate "export
@@ -228,7 +228,7 @@
 #
 # PORTAGE_RSYNC_EXTRA_OPTS can be used to feed additional options to the rsync
 #     command used by `emerge --sync`. This will not change the default options
-#     which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know 
+#     which are set by PORTAGE_RSYNC_OPTS (don't change those unless you know
 #     exactly what you're doing).
 #PORTAGE_RSYNC_EXTRA_OPTS=""
 #
@@ -291,7 +291,7 @@
 #     Note that to display ccache statistics outside of portage, you must
 #     remember to give the correct path to the cache.
 #
-#        $ CCACHE_DIR=/var/tmp/ccache ccache -s 
+#        $ CCACHE_DIR=/var/tmp/ccache ccache -s
 #
 #CCACHE_DIR="${PORTAGE_TMPDIR}/ccache"
 
@@ -306,11 +306,11 @@
 # PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
 #                      included in portage are (empty means logging is disabled):
 #                          echo (display messages again when emerge exits)
-#                          save (saves one log per package in $PORT_LOGDIR/elog, 
+#                          save (saves one log per package in $PORT_LOGDIR/elog,
 #                                /var/log/portage/elog if $PORT_LOGDIR is unset)
 #                          custom (passes all messages to $PORTAGE_ELOG_COMMAND)
 #                          syslog (sends all messages to syslog)
-#                          mail (send all messages to the mailserver defined 
+#                          mail (send all messages to the mailserver defined
 #                                in $PORTAGE_ELOG_MAILURI)
 #                          save_summary (like "save" but merges all messages
 #                                        in $PORT_LOGDIR/elog/summary.log,
@@ -327,7 +327,7 @@
 
 # PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
 #                      to process log messages. Two variables are expanded:
-#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                          ${PACKAGE} - expands to the cpv entry of the processed
 #                                       package (see $PVR in ebuild(5))
 #                          ${LOGFILE} - absolute path to the logfile
 #						Both variables have to be quoted with single quotes

[gentoo-commits] proj/portage:master commit in: cnf/

[Brian Dolbec]

commit:     9784eec5e074924b4ee9ccb3e90582d195c6dbdc
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Jan  6 21:58:02 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 22:12:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9784eec5

Update cnf/make.conf.example.${ARCH}.diff patches wrt 98f930d4d

Otherwise they fail to apply, which makes portage-9999 fail at prepare
phase.

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 cnf/make.conf.example.alpha.diff      | 2 +-
 cnf/make.conf.example.amd64-fbsd.diff | 2 +-
 cnf/make.conf.example.amd64.diff      | 2 +-
 cnf/make.conf.example.arm.diff        | 2 +-
 cnf/make.conf.example.hppa.diff       | 2 +-
 cnf/make.conf.example.ia64.diff       | 2 +-
 cnf/make.conf.example.m68k.diff       | 2 +-
 cnf/make.conf.example.mips.diff       | 2 +-
 cnf/make.conf.example.ppc.diff        | 2 +-
 cnf/make.conf.example.ppc64.diff      | 2 +-
 cnf/make.conf.example.s390.diff       | 2 +-
 cnf/make.conf.example.sh.diff         | 2 +-
 cnf/make.conf.example.sparc-fbsd.diff | 2 +-
 cnf/make.conf.example.sparc.diff      | 2 +-
 cnf/make.conf.example.x86-fbsd.diff   | 2 +-
 cnf/make.conf.example.x86.diff        | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cnf/make.conf.example.alpha.diff b/cnf/make.conf.example.alpha.diff
index 5306999..83c09ea 100644
--- a/cnf/make.conf.example.alpha.diff
+++ b/cnf/make.conf.example.alpha.diff
@@ -15,7 +15,7 @@
 +#CHOST="alphaev67-unknown-linux-gnu"
 +CHOST="alpha-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +50,18 @@

diff --git a/cnf/make.conf.example.amd64-fbsd.diff b/cnf/make.conf.example.amd64-fbsd.diff
index 1277b6d..a02329b 100644
--- a/cnf/make.conf.example.amd64-fbsd.diff
+++ b/cnf/make.conf.example.amd64-fbsd.diff
@@ -9,7 +9,7 @@
 +#
 +CHOST="x86_64-gentoo-freebsd7.1"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +44,35 @@

diff --git a/cnf/make.conf.example.amd64.diff b/cnf/make.conf.example.amd64.diff
index dfa4b42..8286df6 100644
--- a/cnf/make.conf.example.amd64.diff
+++ b/cnf/make.conf.example.amd64.diff
@@ -9,7 +9,7 @@
 +#
 +CHOST="x86_64-pc-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +44,35 @@

diff --git a/cnf/make.conf.example.arm.diff b/cnf/make.conf.example.arm.diff
index e52d1bc..200e476 100644
--- a/cnf/make.conf.example.arm.diff
+++ b/cnf/make.conf.example.arm.diff
@@ -17,7 +17,7 @@
 +#
 +CHOST="armv4l-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +52,22 @@

diff --git a/cnf/make.conf.example.hppa.diff b/cnf/make.conf.example.hppa.diff
index 2d17b37..78db02e 100644
--- a/cnf/make.conf.example.hppa.diff
+++ b/cnf/make.conf.example.hppa.diff
@@ -16,7 +16,7 @@
 +#CHOST="hppa1.1-unknown-linux-gnu"
 +#CHOST="hppa2.0-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,14 +51,38 @@

diff --git a/cnf/make.conf.example.ia64.diff b/cnf/make.conf.example.ia64.diff
index 68a0cb0..378db8a 100644
--- a/cnf/make.conf.example.ia64.diff
+++ b/cnf/make.conf.example.ia64.diff
@@ -11,7 +11,7 @@
 +
 +CHOST="ia64-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -76,7 +83,7 @@

diff --git a/cnf/make.conf.example.m68k.diff b/cnf/make.conf.example.m68k.diff
index f967461..7d82b3b 100644
--- a/cnf/make.conf.example.m68k.diff
+++ b/cnf/make.conf.example.m68k.diff
@@ -11,7 +11,7 @@
 +#
 +CHOST="m68k-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -41,7 +48,7 @@

diff --git a/cnf/make.conf.example.mips.diff b/cnf/make.conf.example.mips.diff
index 7d3d83d..0b521a7 100644
--- a/cnf/make.conf.example.mips.diff
+++ b/cnf/make.conf.example.mips.diff
@@ -11,7 +11,7 @@
 +
 +CHOST="mips-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +46,15 @@

diff --git a/cnf/make.conf.example.ppc.diff b/cnf/make.conf.example.ppc.diff
index b34de8e..a7ef9cf 100644
--- a/cnf/make.conf.example.ppc.diff
+++ b/cnf/make.conf.example.ppc.diff
@@ -11,7 +11,7 @@
 +
 +CHOST="powerpc-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +46,56 @@

diff --git a/cnf/make.conf.example.ppc64.diff b/cnf/make.conf.example.ppc64.diff
index 961508e..73ce993 100644
--- a/cnf/make.conf.example.ppc64.diff
+++ b/cnf/make.conf.example.ppc64.diff
@@ -11,7 +11,7 @@
 +
 +CHOST="powerpc64-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,9 +46,38 @@

diff --git a/cnf/make.conf.example.s390.diff b/cnf/make.conf.example.s390.diff
index c780762..8dd137f 100644
--- a/cnf/make.conf.example.s390.diff
+++ b/cnf/make.conf.example.s390.diff
@@ -11,7 +11,7 @@
 +
 +CHOST="s390-ibm-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -76,7 +83,7 @@

diff --git a/cnf/make.conf.example.sh.diff b/cnf/make.conf.example.sh.diff
index bfe9dc7..fb90124 100644
--- a/cnf/make.conf.example.sh.diff
+++ b/cnf/make.conf.example.sh.diff
@@ -17,7 +17,7 @@
 +#
 +CHOST="sh4-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +52,15 @@

diff --git a/cnf/make.conf.example.sparc-fbsd.diff b/cnf/make.conf.example.sparc-fbsd.diff
index 25e6f46..2ab708b 100644
--- a/cnf/make.conf.example.sparc-fbsd.diff
+++ b/cnf/make.conf.example.sparc-fbsd.diff
@@ -11,7 +11,7 @@
 +# profile and of freebsd-lib package.
 +CHOST="sparc64-gentoo-freebsd6.2"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -76,7 +83,7 @@

diff --git a/cnf/make.conf.example.sparc.diff b/cnf/make.conf.example.sparc.diff
index 1055b4a..a822d6b 100644
--- a/cnf/make.conf.example.sparc.diff
+++ b/cnf/make.conf.example.sparc.diff
@@ -13,7 +13,7 @@
 +#
 +# CHOST="sparc-unknown-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +48,34 @@

diff --git a/cnf/make.conf.example.x86-fbsd.diff b/cnf/make.conf.example.x86-fbsd.diff
index d5e02fe..29c75d0 100644
--- a/cnf/make.conf.example.x86-fbsd.diff
+++ b/cnf/make.conf.example.x86-fbsd.diff
@@ -14,7 +14,7 @@
 +# profile and of freebsd-lib package.
 +CHOST="i686-gentoo-freebsd6.1"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +49,34 @@

diff --git a/cnf/make.conf.example.x86.diff b/cnf/make.conf.example.x86.diff
index 3247126..cdea154 100644
--- a/cnf/make.conf.example.x86.diff
+++ b/cnf/make.conf.example.x86.diff
@@ -13,7 +13,7 @@
 +# All K6's are i586.
 +CHOST="i686-pc-linux-gnu"
 +
- # Host and optimization settings 
+ # Host and optimization settings
  # ==============================
  #
 @@ -39,10 +48,65 @@

[gentoo-commits] proj/portage:master commit in: cnf/

[Michał Górny]

commit:     8868b38ec1d26c264f27031fbb4d496e7e8fe62a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 07:16:52 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 08:06:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8868b38e

make.globals: Enable FEATURES=multilib-strict by default

Enable the multilib-strict feature necessary for Portage to detect
ebuilds not respecting libdir for libraries. Since those issues were
reliably fixed over the years and we're nearing the removal of 'lib'
symlink, I think we can safely enable it by default for our users
without risking many additional issues for them.

At the same time, many proxied maintainers keep submitting ebuilds that
do not respect libdir, and that require us to explicitly point that out
to them. Having Portage detect that by default would be really helpful.

Acked-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/make.globals | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 18eba947b..ea50ab615 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -52,7 +52,8 @@ FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${ho
 # Default user options
 FEATURES="assume-digests binpkg-logs
           config-protect-if-modified distlocks ebuild-locks
-          fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned
+          fixlafiles merge-sync multilib-strict news
+          parallel-fetch preserve-libs protect-owned
           sandbox sfperms strict unknown-features-warn unmerge-logs
           unmerge-orphans userfetch userpriv usersandbox usersync"
 

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     8401685e8d03c8d3ba0e2c7fc432f430880a4c8c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 09:17:33 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 09:21:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8401685e

PORTAGE_XATTR_EXCLUDE: add common user.* attributes (bug 640290)

Common user.* attributes should be safe to exclude, and they
are not supported on tmpfs, except for user.pax.* attributes
that are supported with the patch from bug 470644.

See: https://www.freedesktop.org/wiki/CommonExtendedAttributes/
Bug: https://bugs.gentoo.org/612612
Bug: https://bugs.gentoo.org/640290

 cnf/make.globals | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index ea50ab615..08a37a534 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -127,8 +127,11 @@ PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA256 --clearsign --yes -
 # security.* attributes may be special (see bug 461868), but
 # security.capability is specifically not excluded (bug 548516).
 # system.nfs4_acl attributes are irrelevant, see bug #475496.
+# user.* attributes are not supported on tmpfs (bug 640290), but
+# user.pax.* is supported with the patch from bug 470644.
 PORTAGE_XATTR_EXCLUDE="btrfs.* security.evm security.ima
-	security.selinux system.nfs4_acl"
+	security.selinux system.nfs4_acl user.apache_handler
+	user.Beagle.* user.dublincore.* user.mime_encoding user.xdg.*"
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **

[gentoo-commits] proj/portage:master commit in: cnf/

[Michał Górny]

commit:     a77e2e15e088bee783cb6288f23856fef020a91a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 16:40:13 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 11 07:48:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a77e2e15

repos.conf: Use openpgp-keys-* as key provider for gemato

Switch the key provider from unmaintained app-crypt/gentoo-keys
to app-crypt/openpgp-keys-gentoo-release.  The latter has the advantage
of supplying current, working keys in the more portable OpenPGP format
(rather than GnuPG binary keyring).

Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/repos.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cnf/repos.conf b/cnf/repos.conf
index 987be6462..352073cfd 100644
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@ -9,7 +9,7 @@ auto-sync = yes
 sync-rsync-verify-jobs = 1
 sync-rsync-verify-metamanifest = yes
 sync-rsync-verify-max-age = 24
-sync-openpgp-key-path = /var/lib/gentoo/gkeys/keyrings/gentoo/release/pubring.gpg
+sync-openpgp-key-path = /usr/share/openpgp-keys/gentoo-release.asc
 sync-openpgp-key-refresh-retry-count = 40
 sync-openpgp-key-refresh-retry-overall-timeout = 1200
 sync-openpgp-key-refresh-retry-delay-exp-base = 2

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     36dca004be44e2ca51cf0188958e9404136a049f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 17:58:32 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 18:00:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=36dca004

cnf/repos.conf: allow sync-allow-hardlinks in DEFAULT

If we have a local sync-allow-hardlinks setting in [gentoo],
it overrides the DEFAULT section. The default setting for
sync-allow-hardlinks is already done in the RepoConfig
class.

Fixes: 84822ef7a214 ("rsync: quarantine data prior to verification (bug 660410)")

 cnf/repos.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cnf/repos.conf b/cnf/repos.conf
index 419f6d118..352073cfd 100644
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@ -6,7 +6,6 @@ location = /usr/portage
 sync-type = rsync
 sync-uri = rsync://rsync.gentoo.org/gentoo-portage
 auto-sync = yes
-sync-allow-hardlinks = yes
 sync-rsync-verify-jobs = 1
 sync-rsync-verify-metamanifest = yes
 sync-rsync-verify-max-age = 24

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     d40b9fc1f9591efab0c28fc1cbee1980dc86c735
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 12 10:02:14 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 10:03:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d40b9fc1

Initial cnf/make.conf.example.arm64.diff (bug 636674)

Bug: https://bugs.gentoo.org/636674

 cnf/make.conf.example.arm64.diff | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/cnf/make.conf.example.arm64.diff b/cnf/make.conf.example.arm64.diff
new file mode 100644
index 000000000..db1fee704
--- /dev/null
+++ b/cnf/make.conf.example.arm64.diff
@@ -0,0 +1,37 @@
+--- make.conf.example
++++ make.conf.example
+@@ -39,9 +39,24 @@
+ # -frecord-gcc-switches, since otherwise the check could result in false
+ # positive results.
+ #
+-# Please refer to the GCC manual for a list of possible values.
++# -mcpu specifies the name of the target processor, optionally suffixed by one
++# or more feature modifiers. -march and -mtune are automatically deduced,
++# unless set as well.
++# -march specifies the name of the target architecture, optionally suffixed
++# by one or more feature modifiers.
++# -mtune specifies the name of the target processor for which to tune
++# performance of the code.
++# Set -march and -mtune if you want to build binaries that run with the given
++# architecture instructions and is tuned for a more specific CPU without
++# using its added instructions.
++# Set only -mcpu if you want to build binaries that are most optimal for the
++# given CPU, but might not run on others.
++#
++# Please refer to the GCC manual "AArch64 Options" section for a list of
++# possible architecture, CPU and feature values.
+ #
+ #CFLAGS="-O2 -pipe"
++#CLFAGS="-O2 -pipe -mcpu=native"
+ #
+ # If you set a CFLAGS above, then this line will set your default C++ flags to
+ # the same settings.
+@@ -76,7 +91,7 @@
+ # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
+ # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
+ #
+-#ACCEPT_KEYWORDS="~arch"
++#ACCEPT_KEYWORDS="~arm64"
+ 
+ # ACCEPT_LICENSE is used to mask packages based on licensing restrictions.
+ # It may contain both license and group names, where group names are

[gentoo-commits] proj/portage:master commit in: cnf/

[Michał Górny]

commit:     55a9d4ccc5ac90b454638f9205f8a5d20ca8b47a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 12 17:36:48 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 18:41:25 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=55a9d4cc

Enable {ipc,network,pid}-sandbox by default

The sandboxes are stable enough to be enabled by default, and they all
prevent undesirable situations.  Furthermore, they all gracefully handle
missing namespace support.

Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 cnf/make.globals | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index d394a1890..1bcc7ce64 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -52,10 +52,11 @@ FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${ho
 # Default user options
 FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs
           config-protect-if-modified distlocks ebuild-locks
-          fixlafiles merge-sync multilib-strict news
-          parallel-fetch preserve-libs protect-owned
-          sandbox sfperms strict unknown-features-warn unmerge-logs
-          unmerge-orphans userfetch userpriv usersandbox usersync"
+          fixlafiles ipc-sandbox merge-sync multilib-strict
+          network-sandbox news parallel-fetch pid-sandbox
+          preserve-libs protect-owned sandbox sfperms strict
+          unknown-features-warn unmerge-logs unmerge-orphans userfetch
+          userpriv usersandbox usersync"
 
 # Ignore file collisions in /lib/modules since files inside this directory
 # are never unmerged, and therefore collisions must be ignored in order for

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     cde445abb6d3bcc357355589c4d6d9365069d247
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 05:14:57 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 05:16:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=cde445ab

cnf/make.conf.example: remove comment about DISTDIR and PKGDIR in PORTDIR

Reported-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Bug: https://bugs.gentoo.org/378603#c32
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/make.conf.example | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index 94210faa9..a309a5c43 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -107,10 +107,7 @@
 #     this, you must update your /etc/portage/make.profile symlink accordingly.
 #     ***Warning***
 #     Data stored inside PORTDIR is in peril of being overwritten or deleted by
-#     the emerge --sync command. The default value of PORTAGE_RSYNC_OPTS
-#     will protect the default locations of DISTDIR and PKGDIR, but users are
-#     warned that any other locations inside PORTDIR are not necessarily safe
-#     for data storage.
+#     the emerge --sync command.
 #PORTDIR=/var/db/repos/gentoo
 #
 # DISTDIR is where all of the source code tarballs will be placed for

[gentoo-commits] proj/portage:master commit in: cnf/

[Michał Górny]

commit:     ed2a826f8d2fc5b74a714e0e37561cec25abc79b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 05:17:20 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 05:39:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ed2a826f

repos.conf: Default to using Gentoo keyservers

Default to using hkps://keys.gentoo.org which are guaranteed to hold
the newest copies of Gentoo keys, are secured against key poisoning
and are more reliable than SKS.

Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 cnf/repos.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cnf/repos.conf b/cnf/repos.conf
index e84840bf2..2d73b3e35 100644
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@ -10,6 +10,7 @@ sync-rsync-verify-jobs = 1
 sync-rsync-verify-metamanifest = yes
 sync-rsync-verify-max-age = 24
 sync-openpgp-key-path = /usr/share/openpgp-keys/gentoo-release.asc
+sync-openpgp-keyserver = hkps://keys.gentoo.org
 sync-openpgp-key-refresh-retry-count = 40
 sync-openpgp-key-refresh-retry-overall-timeout = 1200
 sync-openpgp-key-refresh-retry-delay-exp-base = 2

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     64d34590d6ef8825538ff3ad4539a9ea8404b41e
Author:     Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Wed Sep 25 23:07:57 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 00:02:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=64d34590

repos.conf: remove mention of squashdelta from default config

squashdelta was removed in 090c8c91dad9 ("portage/sync/modules: Remove
the squashdelta module")

Bug: https://bugs.gentoo.org/614422
Closes: https://github.com/gentoo/portage/pull/461
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/repos.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cnf/repos.conf b/cnf/repos.conf
index e71b704db..6cb6e3b3c 100644
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@ -17,7 +17,3 @@ sync-openpgp-key-refresh-retry-delay-exp-base = 2
 sync-openpgp-key-refresh-retry-delay-max = 60
 sync-openpgp-key-refresh-retry-delay-mult = 4
 sync-webrsync-verify-signature = yes
-
-# for daily squashfs snapshots
-#sync-type = squashdelta
-#sync-uri = mirror://gentoo/../snapshots/squashfs

[gentoo-commits] proj/portage:master commit in: cnf/

[Michał Górny]

commit:     03c54e340073620f489ca85bca94267a198174fe
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 14:59:43 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 18:07:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=03c54e34

make.globals: Change FETCHCOMMAND_RSYNC to --copy-links

Change FETCHCOMMAND_RSYNC to use '-Lt' over '-a'.  Notably, this
replaces --links with --copy-links option, i.e. makes rsync copy
underlying files when symlinks are met.  This is important since
we do not transfer symlink targets, therefore '-l' ends up creating
dangling symlinks.

This also removes most of the other options that are irrelevant or even
undesirable to distfile fetching, that is:

- '-r' since we always fetch a single file, so recursive operation is
  unnecessary
- '-p', '-o', '-g' since we want to apply our permissions and ownership
  for distfiles rather than copying the one from mirrors,
- '-D' since we do not expect any devices or specials in distfiles.

Copying timestamps is preserved in case it's helpful in determining
whether files need to be refetched.

Bug: https://bugs.gentoo.org/698046
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 cnf/make.globals | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 9eeb7a01e..50511e812 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -38,8 +38,8 @@ PORTAGE_TMPDIR="/var/tmp"
 FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 RESUMECOMMAND="wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 
-FETCHCOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
-RESUMECOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
+FETCHCOMMAND_RSYNC="rsync -LtvP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
+RESUMECOMMAND_RSYNC="rsync -LtvP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
 
 # NOTE: rsync will evaluate quotes embedded inside PORTAGE_SSH_OPTS
 FETCHCOMMAND_SSH="bash -c \"x=\\\${2#ssh://} ; host=\\\${x%%/*} ; port=\\\${host##*:} ; host=\\\${host%:*} ; [[ \\\${host} = \\\${port} ]] && port= ; exec rsync --rsh=\\\"ssh \\\${port:+-p\\\${port}} \\\${3}\\\" -avP \\\"\\\${host}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" rsync \"\${DISTDIR}/\${FILE}\" \"\${URI}\" \"\${PORTAGE_SSH_OPTS}\""

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     73acbb1a7f235f3eeda6a289684e4f43ffdd7dd6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 21:53:49 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May  3 20:27:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=73acbb1a

make.globals: add default BINPKG_COMPRESS setting (bug 715108)

The ebuild will have a default enabled USE=zstd which changes the
default to zstd here.

Bug: https://bugs.gentoo.org/715108
Bug: https://bugs.gentoo.org/719456
Reviewed-by: Brian Dolbec <dolsen <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/make.globals | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 139e1ce97..4a59dbe3c 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # System-wide defaults for the Portage system
 
@@ -34,6 +34,9 @@ RPMDIR="/var/cache/rpm"
 # Temporary build directory
 PORTAGE_TMPDIR="/var/tmp"
 
+# The compression used for binary packages. Defaults to zstd when USE=zstd is enabled.
+BINPKG_COMPRESS="bzip2"
+
 # Fetching command (3 tries, passive ftp for firewall compatibility)
 FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 RESUMECOMMAND="wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     9032155a5d755dc08555a4caff835869f47f0b17
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 21:11:53 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 21:14:53 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9032155a

Add make.conf.example for riscv

Bug: https://bugs.gentoo.org/812434
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/make.conf.example.riscv.diff | 61 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/cnf/make.conf.example.riscv.diff b/cnf/make.conf.example.riscv.diff
new file mode 100644
index 000000000..df1e6a70d
--- /dev/null
+++ b/cnf/make.conf.example.riscv.diff
@@ -0,0 +1,61 @@
+--- make.conf.example
++++ make.conf.example
+@@ -22,6 +22,15 @@
+ # Example:
+ #USE="X gtk gnome -alsa"
+ 
++# Host Setting
++# ===========
++#
++# All RV64 systems should use this host setting:
++CHOST="riscv64-unknown-linux-gnu"
++
++# whereas all RV32 ones should use:
++#CHOST="riscv32-unknown-linux-gnu"
++
+ # Host and optimization settings
+ # ==============================
+ #
+@@ -39,9 +48,31 @@
+ # -frecord-gcc-switches, since otherwise the check could result in false
+ # positive results.
+ #
+-# Please refer to the GCC manual for a list of possible values.
++# -mcpu=<cpu-type> tells the compiler to take full advantage of the ABI and
++# instructions available on a certain CPU. This will produce code which may
++# not run on other RISC-V CPUs, even if they support the same ISA.
++#
++# -mtune=<cpu-type-or-series> results in code optimised for a specific CPU
++# (e.g. SiFive U74) or family (e.g. the SiFive 7 series) without breaking
++# compatibility with other RISC-V CPUs supporting the same ISA.
++#
++# -march=<isa-string> specifies the exact ISA for which to generate code.
++# This is normally not needed if you set -mcpu but might be useful for CPUs
++# not explicitly supported by gcc yet. Should that be the case and you aren't
++# sure what ISA string to use, the output of /proc/cpuinfo might give you a hint.
++#
++# -mabi=<abi-string> specifies the integer and floating-point calling convention
++# to use. Again, this is normally not needed if you set -mcpu. Care should be
++# taken while setting both -march and -mabi, as some calling conventions are
++# impossible to implement on some ISAs.
++#
++# Please refer to the section "RISC-V Options" of the GCC manual for a list
++# of possible ABI, architecture, CPU and feature values.
++#
++# Decent examples:
+ #
+-#CFLAGS="-O2 -pipe"
++#CFLAGS="-mcpu=sifive-u74 -O2 -pipe"
++#CFLAGS="-mtune=sifive-7-series -O2 -pipe"
+ #
+ # If you set a CFLAGS above, then this line will set your default C++ flags to
+ # the same settings.
+@@ -76,7 +107,7 @@
+ # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
+ # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
+ #
+-#ACCEPT_KEYWORDS="~arch"
++#ACCEPT_KEYWORDS="~riscv"
+ 
+ # ACCEPT_LICENSE is used to mask packages based on licensing restrictions.
+ # It may contain both license and group names, where group names are

[gentoo-commits] proj/portage:master commit in: cnf/

[Zac Medico]

commit:     10534a84f0438cf065925c18b64fe7203a840a73
Author:     Robert Booth <rob <AT> ishigoya <DOT> com>
AuthorDate: Sun Feb  6 19:17:41 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 19:19:21 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=10534a84

dispatch-conf.conf: frozen-files is space-separated

Bug: https://bugs.gentoo.org/830618
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/dispatch-conf.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf
index 7efce8ade..d21434963 100644
--- a/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@ -61,5 +61,6 @@ ignore-previously-merged=no
 # Per-session log file of changes made to configuration files
 #log-file=/var/log/dispatch-conf.log
 
-# List of frozen files for which dispatch-conf will automatically zap updates
+# Space-separated list of frozen files for which dispatch-conf will
+# automatically zap updates
 #frozen-files=""

[gentoo-commits] proj/portage:master commit in: cnf/

[Mike Gilbert]

commit:     dbb4d075ee4991e2b5efdc55dc2d1da2572d8afd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 12:50:12 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 12:50:12 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=dbb4d075

dispatch-conf: add a warning about changing the use-rcs setting

If there are existing files in the archive directory, this may cause
conflicts with the files/directories managed using rcs.

Bug: https://bugs.gentoo.org/837533
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 cnf/dispatch-conf.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf
index d21434963..96574eb8e 100644
--- a/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@ -15,6 +15,9 @@ archive-dir=${EPREFIX}/etc/config-archive
 # the ci(1) man page, users can control access to RCS files by setting
 # the permissions of the directory containing the files (see
 # archive-dir above).
+# WARNING: When changing this setting, you should ensure that
+# archive-dir is empty by removing or renaming any existing directory.
+# Otherwise, conflicts may occur (bug 837533).
 # (yes or no)
 use-rcs=no
 

[gentoo-commits] proj/portage:master commit in: cnf/

[Sam James]

commit:     697e297e45c69ee81199f5c40894ee276370726b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  3 19:46:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug  3 21:15:08 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=697e297e

Fix risc vs riscv typo in Meson file

Closes: https://github.com/gentoo/portage/pull/1076
Signed-off-by: Sam James <sam <AT> gentoo.org>

 cnf/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cnf/meson.build b/cnf/meson.build
index d0d4c9ab1..abd151465 100644
--- a/cnf/meson.build
+++ b/cnf/meson.build
@@ -66,8 +66,8 @@ arch = {
     'loongarch64' : 'loong',
     'mips64' : 'mips',
     'parisc' : 'hppa',
-    'riscv32' : 'risc',
-    'riscv64' : 'risc',
+    'riscv32' : 'riscv',
+    'riscv64' : 'riscv',
     's390x' : 's390',
     'sh4' : 'sh',
     'sparc64' : 'sparc',

[gentoo-commits] proj/portage:master commit in: cnf/

[Sam James]

commit:     c96f8a304f4486f4a491cd351a5b4ace0f7b00de
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  3 18:15:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug  3 21:15:08 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c96f8a30

Fix Meson CPU detection for make.conf

I used the CPU name rather than the family by mistake.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 cnf/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cnf/meson.build b/cnf/meson.build
index 00af62085..d0d4c9ab1 100644
--- a/cnf/meson.build
+++ b/cnf/meson.build
@@ -59,7 +59,7 @@ if eprefix != ''
     )
 endif
 
-arch = host_machine.cpu()
+arch = host_machine.cpu_family()
 
 arch = {
     'aarch64' : 'arm64',

[gentoo-commits] proj/portage:master commit in: cnf/

[Sam James]

commit:     3bf2144eb34101c0539dc4d3e057c13d0790f8d7
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 11:01:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 10:18:00 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3bf2144e

repos.conf: set value of sync-rsync-verify-max-age for ::gentoo to 3

The value sync-rsync-verify-max-age specifies the default age in
days. The current value of 24 is too high for an repo with daily
changes like ::gentoo, and was set under the assumption that
max-age denotes hours [1].

1: 8d99acdb3f4f ("rsync: Issue an explicit warning if Manifest
timestamp is >24hr old")

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Fixes: 8d99acdb3f4f ("rsync: Issue an explicit warning if Manifest timestamp is >24hr old")
Closes: https://github.com/gentoo/portage/pull/1125
Signed-off-by: Sam James <sam <AT> gentoo.org>

 cnf/repos.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cnf/repos.conf b/cnf/repos.conf
index 6cb6e3b3c4..f16fd352ee 100644
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@ -8,7 +8,7 @@ sync-uri = rsync://rsync.gentoo.org/gentoo-portage
 auto-sync = yes
 sync-rsync-verify-jobs = 1
 sync-rsync-verify-metamanifest = yes
-sync-rsync-verify-max-age = 24
+sync-rsync-verify-max-age = 3
 sync-openpgp-key-path = /usr/share/openpgp-keys/gentoo-release.asc
 sync-openpgp-keyserver = hkps://keys.gentoo.org
 sync-openpgp-key-refresh-retry-count = 40

[gentoo-commits] proj/portage:master commit in: cnf/

[Sam James]

commit:     db400f7cd0c40bfce5f9eccb34c3945e58ff8952
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 22:48:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 22:59:23 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=db400f7c

Switch default binary package format to gpkg

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 cnf/make.globals | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 86e9b5b744..af2642988a 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -38,9 +38,9 @@ PORTAGE_TMPDIR="/var/tmp"
 # existing installs where bzip2 is used for backward compatibility.
 BINPKG_COMPRESS="zstd"
 
-# The format used for binary packages. The default is use old "xpak" format.
-# Set to "gpkg" to use new gentoo binary package format.
-BINPKG_FORMAT="xpak"
+# The format used for binary packages. The default is to use the new "gpkg" format.
+# Set to "xpak" to use the old gentoo binary package format.
+BINPKG_FORMAT="gpkg"
 
 # The binary package default GPG signing command.
 # flock is used to avoid a racing condition of gnupg