From 5f26cc2c4c462bc664093e09016c9f38b3096c27 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Sun, 28 May 2017 18:36:32 +0200 Subject: [PATCH 01/25] profile support first part Changes to be committed: deleted: package.keywords/sage deleted: package.keywords/sage-7.5.1 deleted: package.keywords/sage-devel new file: profiles/default/devel/bindoc/parent new file: profiles/default/devel/parent new file: profiles/default/parent new file: profiles/default/stable/bindoc/parent new file: profiles/default/stable/parent renamed: package.use/99sage-bin-doc -> profiles/features/bindoc/package.use renamed: package.unmask/sage -> profiles/package.unmask new file: profiles/prefix/devel/bindoc/parent new file: profiles/prefix/devel/parent renamed: package.keywords/sage.prefix -> profiles/prefix/package.keywords new file: profiles/prefix/parent new file: profiles/prefix/stable/bindoc/parent new file: profiles/prefix/stable/parent renamed: package.keywords/sage-9999 -> profiles/releases/devel/package.keywords renamed: package.use/sage-unstable -> profiles/releases/devel/package.use new file: profiles/releases/devel/parent renamed: package.keywords/sage-7.6 -> profiles/releases/stable/package.keywords renamed: package.use/sage -> profiles/releases/stable/package.use --- package.keywords/sage | 1 - package.keywords/sage-7.5.1 | 188 ------------------ package.keywords/sage-devel | 1 - profiles/default/devel/bindoc/parent | 2 + profiles/default/devel/parent | 2 + profiles/default/parent | 1 + profiles/default/stable/bindoc/parent | 2 + profiles/default/stable/parent | 2 + .../features/bindoc/package.use | 0 .../sage => profiles/package.unmask | 0 profiles/prefix/devel/bindoc/parent | 2 + profiles/prefix/devel/parent | 2 + .../prefix/package.keywords | 0 profiles/prefix/parent | 1 + profiles/prefix/stable/bindoc/parent | 2 + profiles/prefix/stable/parent | 1 + .../releases/devel/package.keywords | 0 .../releases/devel/package.use | 0 profiles/releases/devel/parent | 1 + .../releases/stable/package.keywords | 0 .../releases/stable/package.use | 0 21 files changed, 18 insertions(+), 190 deletions(-) delete mode 120000 package.keywords/sage delete mode 100644 package.keywords/sage-7.5.1 delete mode 120000 package.keywords/sage-devel create mode 100644 profiles/default/devel/bindoc/parent create mode 100644 profiles/default/devel/parent create mode 100644 profiles/default/parent create mode 100644 profiles/default/stable/bindoc/parent create mode 100644 profiles/default/stable/parent rename package.use/99sage-bin-doc => profiles/features/bindoc/package.use (100%) rename package.unmask/sage => profiles/package.unmask (100%) create mode 100644 profiles/prefix/devel/bindoc/parent create mode 100644 profiles/prefix/devel/parent rename package.keywords/sage.prefix => profiles/prefix/package.keywords (100%) create mode 100644 profiles/prefix/parent create mode 100644 profiles/prefix/stable/bindoc/parent create mode 100644 profiles/prefix/stable/parent rename package.keywords/sage-9999 => profiles/releases/devel/package.keywords (100%) rename package.use/sage-unstable => profiles/releases/devel/package.use (100%) create mode 100644 profiles/releases/devel/parent rename package.keywords/sage-7.6 => profiles/releases/stable/package.keywords (100%) rename package.use/sage => profiles/releases/stable/package.use (100%) diff --git a/package.keywords/sage b/package.keywords/sage deleted file mode 120000 index 58987171d..000000000 --- a/package.keywords/sage +++ /dev/null @@ -1 +0,0 @@ -sage-7.6 \ No newline at end of file diff --git a/package.keywords/sage-7.5.1 b/package.keywords/sage-7.5.1 deleted file mode 100644 index 45581a65e..000000000 --- a/package.keywords/sage-7.5.1 +++ /dev/null @@ -1,188 +0,0 @@ -# app-emacs/imaxima-1.0-r3 is needed for >=maxima-5.29 -app-emacs/imaxima -dev-java/asm:2 -~dev-lang/R-3.2.0 -~dev-lang/python-2.7.10 ->=dev-libs/mathjax-2.5.0 -~dev-libs/mpc-1.0.2 ->=dev-libs/ntl-9.8.1 -~dev-libs/ppl-1.1 -dev-libs/c-blosc ->=dev-lisp/ecls-16.0.0::sage-on-gentoo -dev-python/characteristic -dev-python/cvxopt -~dev-python/cysignals-1.4.0 -~dev-python/cython-0.25.2::sage-on-gentoo -~dev-python/bottleneck-0.8.0 ->=dev-python/matplotlib-1.5.1 -~dev-python/networkx-1.10 -~dev-python/pyopenssl-0.14 -~dev-python/cryptography-0.6.1 -~dev-python/future-0.15.2 -dev-python/imagesize -dev-python/ptyprocess -~dev-python/python-dateutil-2.3 -~dev-python/python-openid-2.2.5 -~dev-python/flask-autoindex-0.5 -~dev-python/flask-babel-0.8 -~dev-python/flask-openid-1.2.4 -dev-python/flask-oldsessions -=dev-python/psutil-4.4* -~dev-python/flask-silk-0.2 -=dev-python/setuptools-20* -dev-python/terminado -dev-python/mistune -=dev-python/numpy-1.10*::sage-on-gentoo -dev-python/cycler -dev-python/versioneer -=dev-python/jedi-0.10* -dev-python/typing -=dev-python/ipython-5.3* ->=dev-python/notebook-4.1.0 ->=dev-python/ipywidgets-4.0.0 -dev-python/widgetsnbextension ->=dev-python/ipykernel-4.0.0 -=dev-python/nbformat-4.0* -=dev-python/path-py-7* ->=dev-python/ipyparallel-4.0.0 ->=dev-python/traitlets-4.1.0 -dev-python/entrypoints ->=dev-python/nbconvert-4.0.0 -dev-python/prompt_toolkit -dev-python/wcwidth -dev-python/backports-shutil_get_terminal_size -=dev-python/ipython_genutils-0.1* ->=dev-python/jupyter_core-4.0.0 ->=dev-python/jupyter_client-4.0.0 ->=dev-python/qtconsole-4.0.0 -dev-python/mpmath ->=dev-python/pexpect-4.0.1 -dev-python/pandas -dev-python/pyasn1-modules -~dev-python/pkgconfig-1.2.2 -~dev-python/pycurl-7.19.3.1 -~dev-python/pytz-2014.2 -~dev-python/pytables-3.1.1 -dev-python/rpy -dev-python/simplegeneric -~dev-python/speaklater-1.3 ->=dev-python/sympy-1.0 -=dev-python/twisted-names-15* -=dev-python/twisted-core-15* -=dev-python/twisted-mail-15* -=dev-python/twisted-web-15* -dev-python/webassets -~dev-python/werkzeug-0.9.6 -~dev-python/sphinx-1.4.1 -~dev-python/sphinx-1.4.4 -~dev-tex/sage-latex-3.0 -dev-tex/tkz-berge -dev-tex/tkz-graph -~media-gfx/tachyon-0.98.9 -sci-libs/cddlib -sci-libs/dsdp -~sci-libs/fflas-ffpack-2.2.2 -=sci-libs/fplll-5.0* -~dev-python/fpylll-0.2.3 -~sci-libs/givaro-4.0.2 ->=sci-libs/gsl-1.16 ->=sci-libs/iml-1.0.4 -~sci-mathematics/cliquer-1.21 -~sci-libs/libgap-4.8.3 -~sci-libs/linbox-1.4.2 -~sci-libs/m4ri-20140914 -~sci-libs/m4rie-20150908 -~sci-libs/mpfi-1.5.1 -~sci-libs/pynac-0.7.3 -~sci-libs/scipy-0.17.0 -sci-libs/symmetrica -sci-libs/vecmath-objectclub -sci-libs/zn_poly -~sci-mathematics/arb-2.8.1 -sci-mathematics/cu2 -sci-mathematics/cubex -sci-mathematics/dikcube ->=sci-mathematics/eclib-20150510 -~sci-mathematics/gmp-ecm-6.4.4 -sci-mathematics/flintqs -~sci-mathematics/flint-2.4.5 -~sci-mathematics/flint-2.5.2 -~sci-mathematics/gap-4.8.3 -=sci-mathematics/giac-1.2.2* -dev-gap/GAPDoc ->=sci-mathematics/glpk-4.54 ->=sci-mathematics/lcalc-1.23-r6 -sci-mathematics/lrcalc -~sci-mathematics/maxima-5.35.1::sage-on-gentoo -#~sci-mathematics/maxima-5.38.1::sage-on-gentoo -sci-mathematics/mcube -sci-mathematics/optimal -sci-mathematics/palp -~sci-mathematics/pari-2.8.0_alpha -sci-mathematics/pari-data -~sci-mathematics/planarity-2.2.0 -=sci-mathematics/brial-0.8* -~sci-mathematics/nauty-2.6.1 -sci-mathematics/ratpoints -sci-mathematics/rubiks -sci-mathematics/rw -~sci-mathematics/sage-7.5.1 -~sci-mathematics/sage-data-conway_polynomials-0.4 -~sci-mathematics/sage-data-combinatorial_designs-20140630 -~sci-mathematics/sage-data-elliptic_curves-0.8 -~sci-mathematics/sage-data-graphs-20161026 -~sci-mathematics/sage-data-polytopes_db-20120220 ->=sci-mathematics/sage-notebook-0.13 -~sci-mathematics/singular-4.1.0_p1 -sci-mathematics/sympow -~www-servers/tornado-3.1.1 -########################## -# optional dependencies -########################## -sci-mathematics/ExportSageNB -~sci-chemistry/sage-jmol-bin-14.2.11 -virtual/jre:1.7 -virtual/jdk:1.7 -dev-python/giacpy_sage -######################### -# sage optional binding -######################### -sci-libs/libbraiding -sci-libs/libhomfly -sci-libs/modular_decomposition -~sci-libs/bliss-0.73 -=sci-libs/cxsparse-3.1* -dev-libs/igraph -~dev-python/python-igraph-0.7.0 -# coinor-cbc -#sci-libs/coinor-clp -#sci-libs/coinor-dylp -#sci-libs/coinor-vol -#sci-libs/coinor-cgl -#sci-libs/coinor-utils -#sci-libs/coinor-osi -#sci-libs/coinor-cbc -##################### -# gap packages that can be used in sage -##################### -~dev-gap/aclib-1.2 -~dev-gap/Alnuth-3.0.0 -~dev-gap/autpgrp-1.5 -~dev-gap/crime-1.4 -~dev-gap/crystcat-1.1.6 -~dev-gap/ctbllib-1.2_p2 -~dev-gap/design-1.6 -~dev-gap/factint-1.5.3 -~dev-gap/grape-4.7 -~dev-gap/GUAVA-3.13 -~dev-gap/hap-1.11 -~dev-gap/HAPcryst-0.1.11 -~dev-gap/happrime-0.6 -~dev-gap/laguna-3.7.0 -~dev-gap/polycyclic-2.11 -~dev-gap/polymaking-0.8.1 -~dev-gap/sonata-2.8 -~dev-gap/cryst-4.1.12 -~dev-gap/toric-1.8 -~dev-gap/sage-meta-1.0 - diff --git a/package.keywords/sage-devel b/package.keywords/sage-devel deleted file mode 120000 index 5e5523272..000000000 --- a/package.keywords/sage-devel +++ /dev/null @@ -1 +0,0 @@ -sage-9999 \ No newline at end of file diff --git a/profiles/default/devel/bindoc/parent b/profiles/default/devel/bindoc/parent new file mode 100644 index 000000000..ba5510d6c --- /dev/null +++ b/profiles/default/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../features/bindoc diff --git a/profiles/default/devel/parent b/profiles/default/devel/parent new file mode 100644 index 000000000..b44592240 --- /dev/null +++ b/profiles/default/devel/parent @@ -0,0 +1,2 @@ +../ +../../targets/devel diff --git a/profiles/default/parent b/profiles/default/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/default/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/default/stable/bindoc/parent b/profiles/default/stable/bindoc/parent new file mode 100644 index 000000000..ba5510d6c --- /dev/null +++ b/profiles/default/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../features/bindoc diff --git a/profiles/default/stable/parent b/profiles/default/stable/parent new file mode 100644 index 000000000..93f7a1354 --- /dev/null +++ b/profiles/default/stable/parent @@ -0,0 +1,2 @@ +../ +../../targets/stable diff --git a/package.use/99sage-bin-doc b/profiles/features/bindoc/package.use similarity index 100% rename from package.use/99sage-bin-doc rename to profiles/features/bindoc/package.use diff --git a/package.unmask/sage b/profiles/package.unmask similarity index 100% rename from package.unmask/sage rename to profiles/package.unmask diff --git a/profiles/prefix/devel/bindoc/parent b/profiles/prefix/devel/bindoc/parent new file mode 100644 index 000000000..c9b6222f1 --- /dev/null +++ b/profiles/prefix/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../features/bindoc diff --git a/profiles/prefix/devel/parent b/profiles/prefix/devel/parent new file mode 100644 index 000000000..b0a0bb9f5 --- /dev/null +++ b/profiles/prefix/devel/parent @@ -0,0 +1,2 @@ +../ +../stable diff --git a/package.keywords/sage.prefix b/profiles/prefix/package.keywords similarity index 100% rename from package.keywords/sage.prefix rename to profiles/prefix/package.keywords diff --git a/profiles/prefix/parent b/profiles/prefix/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/stable/bindoc/parent b/profiles/prefix/stable/bindoc/parent new file mode 100644 index 000000000..c9b6222f1 --- /dev/null +++ b/profiles/prefix/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../features/bindoc diff --git a/profiles/prefix/stable/parent b/profiles/prefix/stable/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/stable/parent @@ -0,0 +1 @@ +../ diff --git a/package.keywords/sage-9999 b/profiles/releases/devel/package.keywords similarity index 100% rename from package.keywords/sage-9999 rename to profiles/releases/devel/package.keywords diff --git a/package.use/sage-unstable b/profiles/releases/devel/package.use similarity index 100% rename from package.use/sage-unstable rename to profiles/releases/devel/package.use diff --git a/profiles/releases/devel/parent b/profiles/releases/devel/parent new file mode 100644 index 000000000..b39562b4b --- /dev/null +++ b/profiles/releases/devel/parent @@ -0,0 +1 @@ +../stable diff --git a/package.keywords/sage-7.6 b/profiles/releases/stable/package.keywords similarity index 100% rename from package.keywords/sage-7.6 rename to profiles/releases/stable/package.keywords diff --git a/package.use/sage b/profiles/releases/stable/package.use similarity index 100% rename from package.use/sage rename to profiles/releases/stable/package.use From 51322986d2d5be95593889ec9c932fca1cac7baa Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Sun, 28 May 2017 18:40:12 +0200 Subject: [PATCH 02/25] removed redundant parent Changes to be committed: modified: profiles/prefix/devel/parent --- profiles/prefix/devel/parent | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/prefix/devel/parent b/profiles/prefix/devel/parent index b0a0bb9f5..eb4d9056a 100644 --- a/profiles/prefix/devel/parent +++ b/profiles/prefix/devel/parent @@ -1,2 +1 @@ ../ -../stable From 6ca7c77468db77ac0d6189552a0a1c10caed478d Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Sun, 28 May 2017 19:02:12 +0200 Subject: [PATCH 03/25] added architectures to the prefix profiles Changes to be committed: deleted: profiles/prefix/devel/bindoc/parent new file: profiles/prefix/linux/amd64/devel/bindoc/parent new file: profiles/prefix/linux/amd64/devel/parent renamed: profiles/prefix/devel/parent -> profiles/prefix/linux/amd64/parent new file: profiles/prefix/linux/amd64/stable/bindoc/parent new file: profiles/prefix/linux/amd64/stable/parent renamed: profiles/prefix/stable/parent -> profiles/prefix/linux/parent new file: profiles/prefix/linux/x86/devel/bindoc/parent new file: profiles/prefix/linux/x86/devel/parent new file: profiles/prefix/linux/x86/parent new file: profiles/prefix/linux/x86/stable/bindoc/parent new file: profiles/prefix/linux/x86/stable/parent deleted: profiles/prefix/stable/bindoc/parent new file: profiles/profiles.desc --- profiles/prefix/devel/bindoc/parent | 2 -- profiles/prefix/linux/amd64/devel/bindoc/parent | 2 ++ profiles/prefix/linux/amd64/devel/parent | 2 ++ profiles/prefix/{devel => linux/amd64}/parent | 0 profiles/prefix/linux/amd64/stable/bindoc/parent | 2 ++ profiles/prefix/linux/amd64/stable/parent | 2 ++ profiles/prefix/{stable => linux}/parent | 0 profiles/prefix/linux/x86/devel/bindoc/parent | 2 ++ profiles/prefix/linux/x86/devel/parent | 2 ++ profiles/prefix/linux/x86/parent | 1 + profiles/prefix/linux/x86/stable/bindoc/parent | 2 ++ profiles/prefix/linux/x86/stable/parent | 2 ++ profiles/prefix/stable/bindoc/parent | 2 -- profiles/profiles.desc | 4 ++++ 14 files changed, 21 insertions(+), 4 deletions(-) delete mode 100644 profiles/prefix/devel/bindoc/parent create mode 100644 profiles/prefix/linux/amd64/devel/bindoc/parent create mode 100644 profiles/prefix/linux/amd64/devel/parent rename profiles/prefix/{devel => linux/amd64}/parent (100%) create mode 100644 profiles/prefix/linux/amd64/stable/bindoc/parent create mode 100644 profiles/prefix/linux/amd64/stable/parent rename profiles/prefix/{stable => linux}/parent (100%) create mode 100644 profiles/prefix/linux/x86/devel/bindoc/parent create mode 100644 profiles/prefix/linux/x86/devel/parent create mode 100644 profiles/prefix/linux/x86/parent create mode 100644 profiles/prefix/linux/x86/stable/bindoc/parent create mode 100644 profiles/prefix/linux/x86/stable/parent delete mode 100644 profiles/prefix/stable/bindoc/parent create mode 100644 profiles/profiles.desc diff --git a/profiles/prefix/devel/bindoc/parent b/profiles/prefix/devel/bindoc/parent deleted file mode 100644 index c9b6222f1..000000000 --- a/profiles/prefix/devel/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../features/bindoc diff --git a/profiles/prefix/linux/amd64/devel/bindoc/parent b/profiles/prefix/linux/amd64/devel/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux/amd64/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux/amd64/devel/parent b/profiles/prefix/linux/amd64/devel/parent new file mode 100644 index 000000000..b29a8daf0 --- /dev/null +++ b/profiles/prefix/linux/amd64/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/devel diff --git a/profiles/prefix/devel/parent b/profiles/prefix/linux/amd64/parent similarity index 100% rename from profiles/prefix/devel/parent rename to profiles/prefix/linux/amd64/parent diff --git a/profiles/prefix/linux/amd64/stable/bindoc/parent b/profiles/prefix/linux/amd64/stable/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux/amd64/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux/amd64/stable/parent b/profiles/prefix/linux/amd64/stable/parent new file mode 100644 index 000000000..ed4d3b86e --- /dev/null +++ b/profiles/prefix/linux/amd64/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/stable diff --git a/profiles/prefix/stable/parent b/profiles/prefix/linux/parent similarity index 100% rename from profiles/prefix/stable/parent rename to profiles/prefix/linux/parent diff --git a/profiles/prefix/linux/x86/devel/bindoc/parent b/profiles/prefix/linux/x86/devel/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux/x86/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux/x86/devel/parent b/profiles/prefix/linux/x86/devel/parent new file mode 100644 index 000000000..b29a8daf0 --- /dev/null +++ b/profiles/prefix/linux/x86/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/devel diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/linux/x86/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/linux/x86/stable/bindoc/parent b/profiles/prefix/linux/x86/stable/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux/x86/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux/x86/stable/parent b/profiles/prefix/linux/x86/stable/parent new file mode 100644 index 000000000..ed4d3b86e --- /dev/null +++ b/profiles/prefix/linux/x86/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/stable diff --git a/profiles/prefix/stable/bindoc/parent b/profiles/prefix/stable/bindoc/parent deleted file mode 100644 index c9b6222f1..000000000 --- a/profiles/prefix/stable/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../features/bindoc diff --git a/profiles/profiles.desc b/profiles/profiles.desc new file mode 100644 index 000000000..5deb5d6ff --- /dev/null +++ b/profiles/profiles.desc @@ -0,0 +1,4 @@ +amd64-linux prefix/linux/amd64/stable exp +x86-linux prefix/linux/x86/devel exp +amd64-linux prefix/linux/amd64/stable/bindoc exp +x86-linux prefix/linux/x86/devel/bindoc exp From 6056c89f0e127ff38e8e68c2283e583f77f6d022 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Sun, 28 May 2017 19:09:18 +0200 Subject: [PATCH 04/25] added linux-standalone prefix to profile Changes to be committed: new file: profiles/prefix/linux-standalone/amd64/devel/bindoc/parent new file: profiles/prefix/linux-standalone/amd64/devel/parent new file: profiles/prefix/linux-standalone/amd64/parent new file: profiles/prefix/linux-standalone/amd64/stable/bindoc/parent new file: profiles/prefix/linux-standalone/amd64/stable/parent new file: profiles/prefix/linux-standalone/parent new file: profiles/prefix/linux-standalone/x86/devel/bindoc/parent new file: profiles/prefix/linux-standalone/x86/devel/parent new file: profiles/prefix/linux-standalone/x86/parent new file: profiles/prefix/linux-standalone/x86/stable/bindoc/parent new file: profiles/prefix/linux-standalone/x86/stable/parent modified: profiles/profiles.desc --- .../linux-standalone/amd64/devel/bindoc/parent | 2 ++ profiles/prefix/linux-standalone/amd64/devel/parent | 2 ++ profiles/prefix/linux-standalone/amd64/parent | 1 + .../linux-standalone/amd64/stable/bindoc/parent | 2 ++ .../prefix/linux-standalone/amd64/stable/parent | 2 ++ profiles/prefix/linux-standalone/parent | 1 + .../prefix/linux-standalone/x86/devel/bindoc/parent | 2 ++ profiles/prefix/linux-standalone/x86/devel/parent | 2 ++ profiles/prefix/linux-standalone/x86/parent | 1 + .../linux-standalone/x86/stable/bindoc/parent | 2 ++ profiles/prefix/linux-standalone/x86/stable/parent | 2 ++ profiles/profiles.desc | 13 +++++++++---- 12 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 profiles/prefix/linux-standalone/amd64/devel/bindoc/parent create mode 100644 profiles/prefix/linux-standalone/amd64/devel/parent create mode 100644 profiles/prefix/linux-standalone/amd64/parent create mode 100644 profiles/prefix/linux-standalone/amd64/stable/bindoc/parent create mode 100644 profiles/prefix/linux-standalone/amd64/stable/parent create mode 100644 profiles/prefix/linux-standalone/parent create mode 100644 profiles/prefix/linux-standalone/x86/devel/bindoc/parent create mode 100644 profiles/prefix/linux-standalone/x86/devel/parent create mode 100644 profiles/prefix/linux-standalone/x86/parent create mode 100644 profiles/prefix/linux-standalone/x86/stable/bindoc/parent create mode 100644 profiles/prefix/linux-standalone/x86/stable/parent diff --git a/profiles/prefix/linux-standalone/amd64/devel/bindoc/parent b/profiles/prefix/linux-standalone/amd64/devel/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux-standalone/amd64/devel/parent b/profiles/prefix/linux-standalone/amd64/devel/parent new file mode 100644 index 000000000..b29a8daf0 --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/devel diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux-standalone/amd64/stable/parent b/profiles/prefix/linux-standalone/amd64/stable/parent new file mode 100644 index 000000000..ed4d3b86e --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/stable diff --git a/profiles/prefix/linux-standalone/parent b/profiles/prefix/linux-standalone/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/linux-standalone/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/linux-standalone/x86/devel/bindoc/parent b/profiles/prefix/linux-standalone/x86/devel/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux-standalone/x86/devel/parent b/profiles/prefix/linux-standalone/x86/devel/parent new file mode 100644 index 000000000..b29a8daf0 --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/devel diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/linux-standalone/x86/stable/bindoc/parent b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux-standalone/x86/stable/parent b/profiles/prefix/linux-standalone/x86/stable/parent new file mode 100644 index 000000000..ed4d3b86e --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/stable diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 5deb5d6ff..07a1cfacc 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -1,4 +1,9 @@ -amd64-linux prefix/linux/amd64/stable exp -x86-linux prefix/linux/x86/devel exp -amd64-linux prefix/linux/amd64/stable/bindoc exp -x86-linux prefix/linux/x86/devel/bindoc exp +amd64-linux prefix/linux/amd64/stable exp +x86-linux prefix/linux/x86/devel exp +amd64-linux prefix/linux/amd64/stable/bindoc exp +x86-linux prefix/linux/x86/devel/bindoc exp + +amd64-linux prefix/linux-standalone/amd64/stable exp +x86-linux prefix/linux-standalone/x86/devel exp +amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp +x86-linux prefix/linux-standalone/x86/devel/bindoc exp From 97adc62538e84bd9791adf48802b9f6e84a7d9b8 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Mon, 29 May 2017 14:57:51 +0200 Subject: [PATCH 05/25] add profiles part 2 (x86 and amd64) --- profiles/default/devel/bindoc/parent | 2 -- profiles/default/devel/parent | 2 -- profiles/default/linux/amd64/devel/parent | 2 ++ profiles/default/linux/amd64/parent | 2 ++ .../linux/amd64/stable}/bindoc/parent | 0 profiles/default/linux/amd64/stable/parent | 2 ++ profiles/default/linux/parent | 1 + profiles/default/linux/x86/devel/parent | 2 ++ profiles/default/linux/x86/parent | 2 ++ .../linux/x86/stable}/bindoc/parent | 0 profiles/default/linux/x86/stable/parent | 2 ++ profiles/default/stable/bindoc/parent | 2 -- profiles/default/stable/parent | 2 -- profiles/prefix/linux-standalone/amd64/parent | 1 + profiles/prefix/linux-standalone/x86/parent | 1 + .../prefix/linux/amd64/devel/bindoc/parent | 2 -- profiles/prefix/linux/amd64/parent | 1 + profiles/prefix/linux/x86/devel/bindoc/parent | 2 -- profiles/prefix/linux/x86/parent | 1 + profiles/profiles.desc | 27 ++++++++++++------- 20 files changed, 35 insertions(+), 21 deletions(-) delete mode 100644 profiles/default/devel/bindoc/parent delete mode 100644 profiles/default/devel/parent create mode 100644 profiles/default/linux/amd64/devel/parent create mode 100644 profiles/default/linux/amd64/parent rename profiles/{prefix/linux-standalone/amd64/devel => default/linux/amd64/stable}/bindoc/parent (100%) create mode 100644 profiles/default/linux/amd64/stable/parent create mode 100644 profiles/default/linux/parent create mode 100644 profiles/default/linux/x86/devel/parent create mode 100644 profiles/default/linux/x86/parent rename profiles/{prefix/linux-standalone/x86/devel => default/linux/x86/stable}/bindoc/parent (100%) create mode 100644 profiles/default/linux/x86/stable/parent delete mode 100644 profiles/default/stable/bindoc/parent delete mode 100644 profiles/default/stable/parent delete mode 100644 profiles/prefix/linux/amd64/devel/bindoc/parent delete mode 100644 profiles/prefix/linux/x86/devel/bindoc/parent diff --git a/profiles/default/devel/bindoc/parent b/profiles/default/devel/bindoc/parent deleted file mode 100644 index ba5510d6c..000000000 --- a/profiles/default/devel/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../features/bindoc diff --git a/profiles/default/devel/parent b/profiles/default/devel/parent deleted file mode 100644 index b44592240..000000000 --- a/profiles/default/devel/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../targets/devel diff --git a/profiles/default/linux/amd64/devel/parent b/profiles/default/linux/amd64/devel/parent new file mode 100644 index 000000000..8462268b9 --- /dev/null +++ b/profiles/default/linux/amd64/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../targets/devel diff --git a/profiles/default/linux/amd64/parent b/profiles/default/linux/amd64/parent new file mode 100644 index 000000000..e3b3f9c28 --- /dev/null +++ b/profiles/default/linux/amd64/parent @@ -0,0 +1,2 @@ +../ +../../../arch/amd64 diff --git a/profiles/prefix/linux-standalone/amd64/devel/bindoc/parent b/profiles/default/linux/amd64/stable/bindoc/parent similarity index 100% rename from profiles/prefix/linux-standalone/amd64/devel/bindoc/parent rename to profiles/default/linux/amd64/stable/bindoc/parent diff --git a/profiles/default/linux/amd64/stable/parent b/profiles/default/linux/amd64/stable/parent new file mode 100644 index 000000000..0baa66cc8 --- /dev/null +++ b/profiles/default/linux/amd64/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../targets/stable diff --git a/profiles/default/linux/parent b/profiles/default/linux/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/default/linux/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/default/linux/x86/devel/parent b/profiles/default/linux/x86/devel/parent new file mode 100644 index 000000000..8462268b9 --- /dev/null +++ b/profiles/default/linux/x86/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../targets/devel diff --git a/profiles/default/linux/x86/parent b/profiles/default/linux/x86/parent new file mode 100644 index 000000000..80e3640ef --- /dev/null +++ b/profiles/default/linux/x86/parent @@ -0,0 +1,2 @@ +../ +../../../arch/x86 diff --git a/profiles/prefix/linux-standalone/x86/devel/bindoc/parent b/profiles/default/linux/x86/stable/bindoc/parent similarity index 100% rename from profiles/prefix/linux-standalone/x86/devel/bindoc/parent rename to profiles/default/linux/x86/stable/bindoc/parent diff --git a/profiles/default/linux/x86/stable/parent b/profiles/default/linux/x86/stable/parent new file mode 100644 index 000000000..0baa66cc8 --- /dev/null +++ b/profiles/default/linux/x86/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../targets/stable diff --git a/profiles/default/stable/bindoc/parent b/profiles/default/stable/bindoc/parent deleted file mode 100644 index ba5510d6c..000000000 --- a/profiles/default/stable/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../features/bindoc diff --git a/profiles/default/stable/parent b/profiles/default/stable/parent deleted file mode 100644 index 93f7a1354..000000000 --- a/profiles/default/stable/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../targets/stable diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent index eb4d9056a..e3b3f9c28 100644 --- a/profiles/prefix/linux-standalone/amd64/parent +++ b/profiles/prefix/linux-standalone/amd64/parent @@ -1 +1,2 @@ ../ +../../../arch/amd64 diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent index eb4d9056a..e3b3f9c28 100644 --- a/profiles/prefix/linux-standalone/x86/parent +++ b/profiles/prefix/linux-standalone/x86/parent @@ -1 +1,2 @@ ../ +../../../arch/amd64 diff --git a/profiles/prefix/linux/amd64/devel/bindoc/parent b/profiles/prefix/linux/amd64/devel/bindoc/parent deleted file mode 100644 index 5ced07da2..000000000 --- a/profiles/prefix/linux/amd64/devel/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../../features/bindoc diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent index eb4d9056a..e3b3f9c28 100644 --- a/profiles/prefix/linux/amd64/parent +++ b/profiles/prefix/linux/amd64/parent @@ -1 +1,2 @@ ../ +../../../arch/amd64 diff --git a/profiles/prefix/linux/x86/devel/bindoc/parent b/profiles/prefix/linux/x86/devel/bindoc/parent deleted file mode 100644 index 5ced07da2..000000000 --- a/profiles/prefix/linux/x86/devel/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../../features/bindoc diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent index eb4d9056a..80e3640ef 100644 --- a/profiles/prefix/linux/x86/parent +++ b/profiles/prefix/linux/x86/parent @@ -1 +1,2 @@ ../ +../../../arch/x86 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 07a1cfacc..60aa3cdac 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -1,9 +1,18 @@ -amd64-linux prefix/linux/amd64/stable exp -x86-linux prefix/linux/x86/devel exp -amd64-linux prefix/linux/amd64/stable/bindoc exp -x86-linux prefix/linux/x86/devel/bindoc exp - -amd64-linux prefix/linux-standalone/amd64/stable exp -x86-linux prefix/linux-standalone/x86/devel exp -amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp -x86-linux prefix/linux-standalone/x86/devel/bindoc exp +amd64 default/linux/amd64/stable stable +amd64 default/linux/amd64/stable/bindoc stable +amd64 default/linux/amd64/devel dev +x86 default/linux/x86/stable stable +x86 default/linux/x86/stable/bindoc stable +x86 default/linux/x86/devel dev +amd64-linux prefix/linux/amd64/stable exp +amd64-linux prefix/linux/amd64/stable/bindoc exp +amd64-linux prefix/linux/amd64/devel exp +x86-linux prefix/linux/x86/stable exp +x86-linux prefix/linux/x86/stable/bindoc exp +x86-linux prefix/linux/x86/devel exp +amd64-linux prefix/linux-standalone/amd64/stable exp +amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp +amd64-linux prefix/linux-standalone/amd64/devel exp +x86-linux prefix/linux-standalone/x86/stable exp +x86-linux prefix/linux-standalone/x86/stable/bindoc exp +x86-linux prefix/linux-standalone/x86/devel exp From 65944c28daf173bb0cf413dc7699e2655f925cca Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Thu, 1 Jun 2017 14:31:07 +0200 Subject: [PATCH 06/25] standalone profiles Changes to be committed: new file: profiles/default/linux/amd64/13.0/devel/parent new file: profiles/default/linux/amd64/13.0/parent new file: profiles/default/linux/amd64/13.0/stable/bindoc/parent new file: profiles/default/linux/amd64/13.0/stable/parent deleted: profiles/default/linux/amd64/devel/parent deleted: profiles/default/linux/amd64/stable/bindoc/parent deleted: profiles/default/linux/amd64/stable/parent new file: profiles/default/linux/x86/13.0/devel/parent new file: profiles/default/linux/x86/13.0/parent new file: profiles/default/linux/x86/13.0/stable/bindoc/parent new file: profiles/default/linux/x86/13.0/stable/parent deleted: profiles/default/linux/x86/devel/parent deleted: profiles/default/linux/x86/stable/bindoc/parent deleted: profiles/default/linux/x86/stable/parent modified: profiles/prefix/linux-standalone/amd64/parent modified: profiles/prefix/linux-standalone/x86/parent modified: profiles/prefix/linux/amd64/parent modified: profiles/prefix/linux/x86/parent modified: profiles/profiles.desc --- .../default/linux/amd64/13.0/devel/parent | 2 ++ profiles/default/linux/amd64/13.0/parent | 2 ++ .../linux/amd64/13.0/stable/bindoc/parent | 2 ++ .../default/linux/amd64/13.0/stable/parent | 2 ++ profiles/default/linux/amd64/devel/parent | 2 -- .../default/linux/amd64/stable/bindoc/parent | 2 -- profiles/default/linux/amd64/stable/parent | 2 -- profiles/default/linux/x86/13.0/devel/parent | 2 ++ profiles/default/linux/x86/13.0/parent | 2 ++ .../linux/x86/13.0/stable/bindoc/parent | 2 ++ profiles/default/linux/x86/13.0/stable/parent | 2 ++ profiles/default/linux/x86/devel/parent | 2 -- .../default/linux/x86/stable/bindoc/parent | 2 -- profiles/default/linux/x86/stable/parent | 2 -- profiles/prefix/linux-standalone/amd64/parent | 1 + profiles/prefix/linux-standalone/x86/parent | 1 + profiles/prefix/linux/amd64/parent | 1 + profiles/prefix/linux/x86/parent | 1 + profiles/profiles.desc | 20 +++++++++---------- 19 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 profiles/default/linux/amd64/13.0/devel/parent create mode 100644 profiles/default/linux/amd64/13.0/parent create mode 100644 profiles/default/linux/amd64/13.0/stable/bindoc/parent create mode 100644 profiles/default/linux/amd64/13.0/stable/parent delete mode 100644 profiles/default/linux/amd64/devel/parent delete mode 100644 profiles/default/linux/amd64/stable/bindoc/parent delete mode 100644 profiles/default/linux/amd64/stable/parent create mode 100644 profiles/default/linux/x86/13.0/devel/parent create mode 100644 profiles/default/linux/x86/13.0/parent create mode 100644 profiles/default/linux/x86/13.0/stable/bindoc/parent create mode 100644 profiles/default/linux/x86/13.0/stable/parent delete mode 100644 profiles/default/linux/x86/devel/parent delete mode 100644 profiles/default/linux/x86/stable/bindoc/parent delete mode 100644 profiles/default/linux/x86/stable/parent diff --git a/profiles/default/linux/amd64/13.0/devel/parent b/profiles/default/linux/amd64/13.0/devel/parent new file mode 100644 index 000000000..7cb4764a0 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../../targets/devel diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent new file mode 100644 index 000000000..f49cf11b1 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/amd64/13.0 +../ diff --git a/profiles/default/linux/amd64/13.0/stable/bindoc/parent b/profiles/default/linux/amd64/13.0/stable/bindoc/parent new file mode 100644 index 000000000..5c37a31e0 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../../features/bindoc diff --git a/profiles/default/linux/amd64/13.0/stable/parent b/profiles/default/linux/amd64/13.0/stable/parent new file mode 100644 index 000000000..9f7330b42 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../../targets/stable diff --git a/profiles/default/linux/amd64/devel/parent b/profiles/default/linux/amd64/devel/parent deleted file mode 100644 index 8462268b9..000000000 --- a/profiles/default/linux/amd64/devel/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../targets/devel diff --git a/profiles/default/linux/amd64/stable/bindoc/parent b/profiles/default/linux/amd64/stable/bindoc/parent deleted file mode 100644 index 5ced07da2..000000000 --- a/profiles/default/linux/amd64/stable/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../../features/bindoc diff --git a/profiles/default/linux/amd64/stable/parent b/profiles/default/linux/amd64/stable/parent deleted file mode 100644 index 0baa66cc8..000000000 --- a/profiles/default/linux/amd64/stable/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../targets/stable diff --git a/profiles/default/linux/x86/13.0/devel/parent b/profiles/default/linux/x86/13.0/devel/parent new file mode 100644 index 000000000..7cb4764a0 --- /dev/null +++ b/profiles/default/linux/x86/13.0/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../../targets/devel diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent new file mode 100644 index 000000000..f49cf11b1 --- /dev/null +++ b/profiles/default/linux/x86/13.0/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/amd64/13.0 +../ diff --git a/profiles/default/linux/x86/13.0/stable/bindoc/parent b/profiles/default/linux/x86/13.0/stable/bindoc/parent new file mode 100644 index 000000000..5c37a31e0 --- /dev/null +++ b/profiles/default/linux/x86/13.0/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../../features/bindoc diff --git a/profiles/default/linux/x86/13.0/stable/parent b/profiles/default/linux/x86/13.0/stable/parent new file mode 100644 index 000000000..9f7330b42 --- /dev/null +++ b/profiles/default/linux/x86/13.0/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../../targets/stable diff --git a/profiles/default/linux/x86/devel/parent b/profiles/default/linux/x86/devel/parent deleted file mode 100644 index 8462268b9..000000000 --- a/profiles/default/linux/x86/devel/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../targets/devel diff --git a/profiles/default/linux/x86/stable/bindoc/parent b/profiles/default/linux/x86/stable/bindoc/parent deleted file mode 100644 index 5ced07da2..000000000 --- a/profiles/default/linux/x86/stable/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../../features/bindoc diff --git a/profiles/default/linux/x86/stable/parent b/profiles/default/linux/x86/stable/parent deleted file mode 100644 index 0baa66cc8..000000000 --- a/profiles/default/linux/x86/stable/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../targets/stable diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent index e3b3f9c28..6594684d1 100644 --- a/profiles/prefix/linux-standalone/amd64/parent +++ b/profiles/prefix/linux-standalone/amd64/parent @@ -1,2 +1,3 @@ +gentoo:prefix/linux-standalone/x86 ../ ../../../arch/amd64 diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent index e3b3f9c28..6594684d1 100644 --- a/profiles/prefix/linux-standalone/x86/parent +++ b/profiles/prefix/linux-standalone/x86/parent @@ -1,2 +1,3 @@ +gentoo:prefix/linux-standalone/x86 ../ ../../../arch/amd64 diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent index e3b3f9c28..02055a081 100644 --- a/profiles/prefix/linux/amd64/parent +++ b/profiles/prefix/linux/amd64/parent @@ -1,2 +1,3 @@ +gentoo:prefix/linux/amd64 ../ ../../../arch/amd64 diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent index 80e3640ef..21a83f841 100644 --- a/profiles/prefix/linux/x86/parent +++ b/profiles/prefix/linux/x86/parent @@ -1,2 +1,3 @@ +prefix/linux/x86 ../ ../../../arch/x86 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 60aa3cdac..70172898f 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -1,18 +1,18 @@ -amd64 default/linux/amd64/stable stable -amd64 default/linux/amd64/stable/bindoc stable -amd64 default/linux/amd64/devel dev -x86 default/linux/x86/stable stable -x86 default/linux/x86/stable/bindoc stable -x86 default/linux/x86/devel dev +amd64 default/linux/amd64/13.0/stable stable +amd64 default/linux/amd64/13.0/stable/bindoc stable +amd64 default/linux/amd64/13.0/devel dev +x86 default/linux/x86/13.0/stable stable +x86 default/linux/x86/13.0/stable/bindoc stable +x86 default/linux/x86/13.0/devel dev amd64-linux prefix/linux/amd64/stable exp amd64-linux prefix/linux/amd64/stable/bindoc exp -amd64-linux prefix/linux/amd64/devel exp +amd64-linux prefix/linux/amd64/devel exp x86-linux prefix/linux/x86/stable exp x86-linux prefix/linux/x86/stable/bindoc exp -x86-linux prefix/linux/x86/devel exp +x86-linux prefix/linux/x86/devel exp amd64-linux prefix/linux-standalone/amd64/stable exp amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp -amd64-linux prefix/linux-standalone/amd64/devel exp +amd64-linux prefix/linux-standalone/amd64/devel exp x86-linux prefix/linux-standalone/x86/stable exp x86-linux prefix/linux-standalone/x86/stable/bindoc exp -x86-linux prefix/linux-standalone/x86/devel exp +x86-linux prefix/linux-standalone/x86/devel exp From 7f4658ec6acfb042f4708153d6d935eb950a8625 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Thu, 1 Jun 2017 16:43:06 +0200 Subject: [PATCH 07/25] absolute paths instead of relative Changes to be committed: modified: profiles/default/linux/amd64/13.0/devel/parent modified: profiles/default/linux/amd64/13.0/parent modified: profiles/default/linux/amd64/13.0/stable/bindoc/parent modified: profiles/default/linux/amd64/13.0/stable/parent modified: profiles/default/linux/amd64/parent modified: profiles/default/linux/parent modified: profiles/default/linux/x86/13.0/devel/parent modified: profiles/default/linux/x86/13.0/parent modified: profiles/default/linux/x86/13.0/stable/bindoc/parent modified: profiles/default/linux/x86/13.0/stable/parent modified: profiles/default/linux/x86/parent modified: profiles/default/parent modified: profiles/prefix/linux-standalone/amd64/devel/parent modified: profiles/prefix/linux-standalone/amd64/parent modified: profiles/prefix/linux-standalone/amd64/stable/bindoc/parent modified: profiles/prefix/linux-standalone/amd64/stable/parent modified: profiles/prefix/linux-standalone/parent modified: profiles/prefix/linux-standalone/x86/devel/parent modified: profiles/prefix/linux-standalone/x86/parent modified: profiles/prefix/linux-standalone/x86/stable/bindoc/parent modified: profiles/prefix/linux-standalone/x86/stable/parent modified: profiles/prefix/linux/amd64/devel/parent modified: profiles/prefix/linux/amd64/parent modified: profiles/prefix/linux/amd64/stable/bindoc/parent modified: profiles/prefix/linux/amd64/stable/parent modified: profiles/prefix/linux/parent modified: profiles/prefix/linux/x86/devel/parent modified: profiles/prefix/linux/x86/parent modified: profiles/prefix/linux/x86/stable/bindoc/parent modified: profiles/prefix/linux/x86/stable/parent modified: profiles/prefix/parent modified: profiles/thirdpartymirrors --- profiles/default/linux/amd64/13.0/devel/parent | 4 ++-- profiles/default/linux/amd64/13.0/parent | 2 +- profiles/default/linux/amd64/13.0/stable/bindoc/parent | 4 ++-- profiles/default/linux/amd64/13.0/stable/parent | 4 ++-- profiles/default/linux/amd64/parent | 4 ++-- profiles/default/linux/parent | 2 +- profiles/default/linux/x86/13.0/devel/parent | 4 ++-- profiles/default/linux/x86/13.0/parent | 2 +- profiles/default/linux/x86/13.0/stable/bindoc/parent | 4 ++-- profiles/default/linux/x86/13.0/stable/parent | 4 ++-- profiles/default/linux/x86/parent | 3 +-- profiles/default/parent | 2 +- profiles/prefix/linux-standalone/amd64/devel/parent | 4 ++-- profiles/prefix/linux-standalone/amd64/parent | 6 +++--- profiles/prefix/linux-standalone/amd64/stable/bindoc/parent | 4 ++-- profiles/prefix/linux-standalone/amd64/stable/parent | 4 ++-- profiles/prefix/linux-standalone/parent | 2 +- profiles/prefix/linux-standalone/x86/devel/parent | 4 ++-- profiles/prefix/linux-standalone/x86/parent | 4 ++-- profiles/prefix/linux-standalone/x86/stable/bindoc/parent | 4 ++-- profiles/prefix/linux-standalone/x86/stable/parent | 4 ++-- profiles/prefix/linux/amd64/devel/parent | 4 ++-- profiles/prefix/linux/amd64/parent | 4 ++-- profiles/prefix/linux/amd64/stable/bindoc/parent | 4 ++-- profiles/prefix/linux/amd64/stable/parent | 4 ++-- profiles/prefix/linux/parent | 2 +- profiles/prefix/linux/x86/devel/parent | 4 ++-- profiles/prefix/linux/x86/parent | 6 +++--- profiles/prefix/linux/x86/stable/bindoc/parent | 4 ++-- profiles/prefix/linux/x86/stable/parent | 4 ++-- profiles/prefix/parent | 2 +- profiles/thirdpartymirrors | 4 ++-- 32 files changed, 58 insertions(+), 59 deletions(-) diff --git a/profiles/default/linux/amd64/13.0/devel/parent b/profiles/default/linux/amd64/13.0/devel/parent index 7cb4764a0..bbb6d7897 100644 --- a/profiles/default/linux/amd64/13.0/devel/parent +++ b/profiles/default/linux/amd64/13.0/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../../targets/devel +.. +sage-on-gentoo:targets/devel diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent index f49cf11b1..f1f056c2f 100644 --- a/profiles/default/linux/amd64/13.0/parent +++ b/profiles/default/linux/amd64/13.0/parent @@ -1,2 +1,2 @@ gentoo:default/linux/amd64/13.0 -../ +.. diff --git a/profiles/default/linux/amd64/13.0/stable/bindoc/parent b/profiles/default/linux/amd64/13.0/stable/bindoc/parent index 5c37a31e0..bc5747dda 100644 --- a/profiles/default/linux/amd64/13.0/stable/bindoc/parent +++ b/profiles/default/linux/amd64/13.0/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/default/linux/amd64/13.0/stable/parent b/profiles/default/linux/amd64/13.0/stable/parent index 9f7330b42..5a30aad9e 100644 --- a/profiles/default/linux/amd64/13.0/stable/parent +++ b/profiles/default/linux/amd64/13.0/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../../targets/stable +.. +sage-on-gentoo:targets/stable diff --git a/profiles/default/linux/amd64/parent b/profiles/default/linux/amd64/parent index e3b3f9c28..e49445b6b 100644 --- a/profiles/default/linux/amd64/parent +++ b/profiles/default/linux/amd64/parent @@ -1,2 +1,2 @@ -../ -../../../arch/amd64 +.. +sage-on-gentoo:arch/amd64 diff --git a/profiles/default/linux/parent b/profiles/default/linux/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/default/linux/parent +++ b/profiles/default/linux/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/default/linux/x86/13.0/devel/parent b/profiles/default/linux/x86/13.0/devel/parent index 7cb4764a0..bbb6d7897 100644 --- a/profiles/default/linux/x86/13.0/devel/parent +++ b/profiles/default/linux/x86/13.0/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../../targets/devel +.. +sage-on-gentoo:targets/devel diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent index f49cf11b1..f1f056c2f 100644 --- a/profiles/default/linux/x86/13.0/parent +++ b/profiles/default/linux/x86/13.0/parent @@ -1,2 +1,2 @@ gentoo:default/linux/amd64/13.0 -../ +.. diff --git a/profiles/default/linux/x86/13.0/stable/bindoc/parent b/profiles/default/linux/x86/13.0/stable/bindoc/parent index 5c37a31e0..bc5747dda 100644 --- a/profiles/default/linux/x86/13.0/stable/bindoc/parent +++ b/profiles/default/linux/x86/13.0/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/default/linux/x86/13.0/stable/parent b/profiles/default/linux/x86/13.0/stable/parent index 9f7330b42..5a30aad9e 100644 --- a/profiles/default/linux/x86/13.0/stable/parent +++ b/profiles/default/linux/x86/13.0/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../../targets/stable +.. +sage-on-gentoo:targets/stable diff --git a/profiles/default/linux/x86/parent b/profiles/default/linux/x86/parent index 80e3640ef..2600c5b96 100644 --- a/profiles/default/linux/x86/parent +++ b/profiles/default/linux/x86/parent @@ -1,2 +1 @@ -../ -../../../arch/x86 +sage-on-gentoo:arch/x86 diff --git a/profiles/default/parent b/profiles/default/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/default/parent +++ b/profiles/default/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/prefix/linux-standalone/amd64/devel/parent b/profiles/prefix/linux-standalone/amd64/devel/parent index b29a8daf0..e121b94a1 100644 --- a/profiles/prefix/linux-standalone/amd64/devel/parent +++ b/profiles/prefix/linux-standalone/amd64/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/devel +.. +sage-on-gentoo:releases/devel diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent index 6594684d1..e54fd690e 100644 --- a/profiles/prefix/linux-standalone/amd64/parent +++ b/profiles/prefix/linux-standalone/amd64/parent @@ -1,3 +1,3 @@ -gentoo:prefix/linux-standalone/x86 -../ -../../../arch/amd64 +gentoo:prefix/linux-standalone/amd64 +.. +sage-on-gentoo:arch/amd64 diff --git a/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent index 5ced07da2..bc5747dda 100644 --- a/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent +++ b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/prefix/linux-standalone/amd64/stable/parent b/profiles/prefix/linux-standalone/amd64/stable/parent index ed4d3b86e..99840371f 100644 --- a/profiles/prefix/linux-standalone/amd64/stable/parent +++ b/profiles/prefix/linux-standalone/amd64/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/stable +.. +sage-on-gentoo:releases/stable diff --git a/profiles/prefix/linux-standalone/parent b/profiles/prefix/linux-standalone/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/prefix/linux-standalone/parent +++ b/profiles/prefix/linux-standalone/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/prefix/linux-standalone/x86/devel/parent b/profiles/prefix/linux-standalone/x86/devel/parent index b29a8daf0..e121b94a1 100644 --- a/profiles/prefix/linux-standalone/x86/devel/parent +++ b/profiles/prefix/linux-standalone/x86/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/devel +.. +sage-on-gentoo:releases/devel diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent index 6594684d1..de5fbd6f9 100644 --- a/profiles/prefix/linux-standalone/x86/parent +++ b/profiles/prefix/linux-standalone/x86/parent @@ -1,3 +1,3 @@ gentoo:prefix/linux-standalone/x86 -../ -../../../arch/amd64 +.. +sage-on-gentoo:arch/x86 diff --git a/profiles/prefix/linux-standalone/x86/stable/bindoc/parent b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent index 5ced07da2..bc5747dda 100644 --- a/profiles/prefix/linux-standalone/x86/stable/bindoc/parent +++ b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/prefix/linux-standalone/x86/stable/parent b/profiles/prefix/linux-standalone/x86/stable/parent index ed4d3b86e..99840371f 100644 --- a/profiles/prefix/linux-standalone/x86/stable/parent +++ b/profiles/prefix/linux-standalone/x86/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/stable +.. +sage-on-gentoo:releases/stable diff --git a/profiles/prefix/linux/amd64/devel/parent b/profiles/prefix/linux/amd64/devel/parent index b29a8daf0..e121b94a1 100644 --- a/profiles/prefix/linux/amd64/devel/parent +++ b/profiles/prefix/linux/amd64/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/devel +.. +sage-on-gentoo:releases/devel diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent index 02055a081..d2b05d5f0 100644 --- a/profiles/prefix/linux/amd64/parent +++ b/profiles/prefix/linux/amd64/parent @@ -1,3 +1,3 @@ gentoo:prefix/linux/amd64 -../ -../../../arch/amd64 +.. +sage-on-gentoo:arch/amd64 diff --git a/profiles/prefix/linux/amd64/stable/bindoc/parent b/profiles/prefix/linux/amd64/stable/bindoc/parent index 5ced07da2..bc5747dda 100644 --- a/profiles/prefix/linux/amd64/stable/bindoc/parent +++ b/profiles/prefix/linux/amd64/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/prefix/linux/amd64/stable/parent b/profiles/prefix/linux/amd64/stable/parent index ed4d3b86e..99840371f 100644 --- a/profiles/prefix/linux/amd64/stable/parent +++ b/profiles/prefix/linux/amd64/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/stable +.. +sage-on-gentoo:releases/stable diff --git a/profiles/prefix/linux/parent b/profiles/prefix/linux/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/prefix/linux/parent +++ b/profiles/prefix/linux/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/prefix/linux/x86/devel/parent b/profiles/prefix/linux/x86/devel/parent index b29a8daf0..e121b94a1 100644 --- a/profiles/prefix/linux/x86/devel/parent +++ b/profiles/prefix/linux/x86/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/devel +.. +sage-on-gentoo:releases/devel diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent index 21a83f841..1cd2f484a 100644 --- a/profiles/prefix/linux/x86/parent +++ b/profiles/prefix/linux/x86/parent @@ -1,3 +1,3 @@ -prefix/linux/x86 -../ -../../../arch/x86 +gentoo:prefix/linux/x86 +.. +sage-on-gentoo:arch/x86 diff --git a/profiles/prefix/linux/x86/stable/bindoc/parent b/profiles/prefix/linux/x86/stable/bindoc/parent index 5ced07da2..bc5747dda 100644 --- a/profiles/prefix/linux/x86/stable/bindoc/parent +++ b/profiles/prefix/linux/x86/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/prefix/linux/x86/stable/parent b/profiles/prefix/linux/x86/stable/parent index ed4d3b86e..99840371f 100644 --- a/profiles/prefix/linux/x86/stable/parent +++ b/profiles/prefix/linux/x86/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/stable +.. +sage-on-gentoo:releases/stable diff --git a/profiles/prefix/parent b/profiles/prefix/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/prefix/parent +++ b/profiles/prefix/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors index 8bafd5b75..4ab5ad78c 100644 --- a/profiles/thirdpartymirrors +++ b/profiles/thirdpartymirrors @@ -1,2 +1,2 @@ -sageupstream http://files.sagemath.org//spkg/upstream/ http://ftp.riken.jp/sagemath/spkg/upstream/ http://echidna.maths.usyd.edu.au/sage/spkg/upstream http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/upstream -sagemath http://sagetrac.lipn.univ-paris13.fr/sage/ +sageupstream http:/files.sagemath.org//spkg/upstream/ http:/ftp.riken.jp/sagemath/spkg/upstream/ http:/echidna.maths.usyd.edu.au/sage/spkg/upstream http:/www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream ftp:/ftp.fu-berlin.de/unix/misc/sage/spkg/upstream +sagemath http:/sagetrac.lipn.univ-paris13.fr/sage/ From 1263e25d9947b3080c5174141a7f3d16178bfcbf Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Thu, 1 Jun 2017 16:52:21 +0200 Subject: [PATCH 08/25] corrected reference to the wrong folder Changes to be committed: modified: profiles/default/linux/amd64/13.0/devel/parent modified: profiles/default/linux/amd64/13.0/stable/parent modified: profiles/default/linux/x86/13.0/devel/parent modified: profiles/default/linux/x86/13.0/stable/parent --- profiles/default/linux/amd64/13.0/devel/parent | 2 +- profiles/default/linux/amd64/13.0/stable/parent | 2 +- profiles/default/linux/x86/13.0/devel/parent | 2 +- profiles/default/linux/x86/13.0/stable/parent | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/default/linux/amd64/13.0/devel/parent b/profiles/default/linux/amd64/13.0/devel/parent index bbb6d7897..e121b94a1 100644 --- a/profiles/default/linux/amd64/13.0/devel/parent +++ b/profiles/default/linux/amd64/13.0/devel/parent @@ -1,2 +1,2 @@ .. -sage-on-gentoo:targets/devel +sage-on-gentoo:releases/devel diff --git a/profiles/default/linux/amd64/13.0/stable/parent b/profiles/default/linux/amd64/13.0/stable/parent index 5a30aad9e..99840371f 100644 --- a/profiles/default/linux/amd64/13.0/stable/parent +++ b/profiles/default/linux/amd64/13.0/stable/parent @@ -1,2 +1,2 @@ .. -sage-on-gentoo:targets/stable +sage-on-gentoo:releases/stable diff --git a/profiles/default/linux/x86/13.0/devel/parent b/profiles/default/linux/x86/13.0/devel/parent index bbb6d7897..e121b94a1 100644 --- a/profiles/default/linux/x86/13.0/devel/parent +++ b/profiles/default/linux/x86/13.0/devel/parent @@ -1,2 +1,2 @@ .. -sage-on-gentoo:targets/devel +sage-on-gentoo:releases/devel diff --git a/profiles/default/linux/x86/13.0/stable/parent b/profiles/default/linux/x86/13.0/stable/parent index 5a30aad9e..99840371f 100644 --- a/profiles/default/linux/x86/13.0/stable/parent +++ b/profiles/default/linux/x86/13.0/stable/parent @@ -1,2 +1,2 @@ .. -sage-on-gentoo:targets/stable +sage-on-gentoo:releases/stable From adadd0f6e036f82e4efa752728c049648aa94f48 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Fri, 2 Jun 2017 22:40:53 +0200 Subject: [PATCH 09/25] profile part 3 + fixes Changes to be committed: modified: metadata/layout.conf new file: profiles/arch.list modified: profiles/default/linux/x86/13.0/parent new file: profiles/eapi new file: profiles/features/bindoc/eapi new file: profiles/prefix/eapi new file: profiles/releases/devel/eapi new file: profiles/releases/stable/eapi --- metadata/layout.conf | 2 ++ profiles/arch.list | 5 +++++ profiles/default/linux/x86/13.0/parent | 2 +- profiles/eapi | 1 + profiles/features/bindoc/eapi | 1 + profiles/prefix/eapi | 1 + profiles/releases/devel/eapi | 1 + profiles/releases/stable/eapi | 1 + 8 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 profiles/arch.list create mode 100644 profiles/eapi create mode 100644 profiles/features/bindoc/eapi create mode 100644 profiles/prefix/eapi create mode 100644 profiles/releases/devel/eapi create mode 100644 profiles/releases/stable/eapi diff --git a/metadata/layout.conf b/metadata/layout.conf index f1f9325df..0ccdb0c37 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -20,3 +20,5 @@ thin-manifests = true update-changelog = false use-manifests = strict + +profile-formats = portage-2 diff --git a/profiles/arch.list b/profiles/arch.list new file mode 100644 index 000000000..a529ca6ad --- /dev/null +++ b/profiles/arch.list @@ -0,0 +1,5 @@ +amd64 +x86 +amd64-linux +x86-linux + diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent index f1f056c2f..fd0a0a46c 100644 --- a/profiles/default/linux/x86/13.0/parent +++ b/profiles/default/linux/x86/13.0/parent @@ -1,2 +1,2 @@ -gentoo:default/linux/amd64/13.0 +gentoo:default/linux/x86/13.0 .. diff --git a/profiles/eapi b/profiles/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/features/bindoc/eapi b/profiles/features/bindoc/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/features/bindoc/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/prefix/eapi b/profiles/prefix/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/prefix/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/releases/devel/eapi b/profiles/releases/devel/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/releases/devel/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/releases/stable/eapi b/profiles/releases/stable/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/releases/stable/eapi @@ -0,0 +1 @@ +5 From 5481b98fd21bc19a39d23718bd344d72d60481fe Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Fri, 2 Jun 2017 23:00:41 +0200 Subject: [PATCH 10/25] removed ::sage-on-gentoo from keywords Changes to be committed: modified: profiles/releases/devel/package.keywords modified: profiles/releases/stable/package.keywords --- profiles/releases/devel/package.keywords | 7 +++---- profiles/releases/stable/package.keywords | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/profiles/releases/devel/package.keywords b/profiles/releases/devel/package.keywords index 1c1da4887..b90175a73 100644 --- a/profiles/releases/devel/package.keywords +++ b/profiles/releases/devel/package.keywords @@ -8,11 +8,11 @@ dev-java/asm:2 >=dev-libs/ntl-9.8.1 ~dev-libs/ppl-1.1 dev-libs/c-blosc ->=dev-lisp/ecls-16.0.0::sage-on-gentoo +>=dev-lisp/ecls-16.0.0 dev-python/characteristic dev-python/cvxopt =dev-python/cysignals-1.6* -~dev-python/cython-0.25.2::sage-on-gentoo +~dev-python/cython-0.25.2 ~dev-python/bottleneck-0.8.0 >=dev-python/matplotlib-1.5.1 ~dev-python/networkx-1.10 @@ -113,7 +113,7 @@ dev-gap/GAPDoc >=sci-mathematics/glpk-4.54 >=sci-mathematics/lcalc-1.23-r6 sci-mathematics/lrcalc -~sci-mathematics/maxima-5.39.0::sage-on-gentoo +~sci-mathematics/maxima-5.39.0 sci-mathematics/mcube sci-mathematics/optimal sci-mathematics/palp @@ -186,4 +186,3 @@ dev-libs/igraph ~dev-gap/cryst-4.1.12 ~dev-gap/toric-1.8 ~dev-gap/sage-meta-1.0 - diff --git a/profiles/releases/stable/package.keywords b/profiles/releases/stable/package.keywords index 6afc64f95..69f2be96b 100644 --- a/profiles/releases/stable/package.keywords +++ b/profiles/releases/stable/package.keywords @@ -8,11 +8,11 @@ dev-java/asm:2 >=dev-libs/ntl-9.8.1 ~dev-libs/ppl-1.1 dev-libs/c-blosc ->=dev-lisp/ecls-16.0.0::sage-on-gentoo +>=dev-lisp/ecls-16.0.0 dev-python/characteristic dev-python/cvxopt ~dev-python/cysignals-1.4.0 -~dev-python/cython-0.25.2::sage-on-gentoo +~dev-python/cython-0.25.2 ~dev-python/bottleneck-0.8.0 >=dev-python/matplotlib-1.5.1 ~dev-python/networkx-1.10 @@ -32,7 +32,7 @@ dev-python/flask-oldsessions =dev-python/setuptools-20* dev-python/terminado dev-python/mistune -=dev-python/numpy-1.10*::sage-on-gentoo +=dev-python/numpy-1.10* dev-python/cycler dev-python/versioneer =dev-python/jedi-0.10* @@ -113,7 +113,7 @@ dev-gap/GAPDoc >=sci-mathematics/glpk-4.54 >=sci-mathematics/lcalc-1.23-r6 sci-mathematics/lrcalc -~sci-mathematics/maxima-5.39.0::sage-on-gentoo +~sci-mathematics/maxima-5.39.0 sci-mathematics/mcube sci-mathematics/optimal sci-mathematics/palp @@ -185,4 +185,3 @@ dev-libs/igraph ~dev-gap/cryst-4.1.12 ~dev-gap/toric-1.8 ~dev-gap/sage-meta-1.0 - From 9ec09c693633745be86b735fb72ff14e36d8b2e5 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Fri, 2 Jun 2017 23:08:06 +0200 Subject: [PATCH 11/25] fixes Changes to be committed: modified: profiles/arch.list modified: profiles/profiles.desc modified: profiles/thirdpartymirrors --- profiles/arch.list | 1 - profiles/profiles.desc | 20 ++++++++++---------- profiles/thirdpartymirrors | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/profiles/arch.list b/profiles/arch.list index a529ca6ad..fb5b33a08 100644 --- a/profiles/arch.list +++ b/profiles/arch.list @@ -2,4 +2,3 @@ amd64 x86 amd64-linux x86-linux - diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 70172898f..34c5399b0 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -1,18 +1,18 @@ -amd64 default/linux/amd64/13.0/stable stable -amd64 default/linux/amd64/13.0/stable/bindoc stable -amd64 default/linux/amd64/13.0/devel dev -x86 default/linux/x86/13.0/stable stable -x86 default/linux/x86/13.0/stable/bindoc stable -x86 default/linux/x86/13.0/devel dev +amd64 default/linux/amd64/13.0/stable stable +amd64 default/linux/amd64/13.0/stable/bindoc stable +amd64 default/linux/amd64/13.0/devel dev +x86 default/linux/x86/13.0/stable stable +x86 default/linux/x86/13.0/stable/bindoc stable +x86 default/linux/x86/13.0/devel dev amd64-linux prefix/linux/amd64/stable exp amd64-linux prefix/linux/amd64/stable/bindoc exp -amd64-linux prefix/linux/amd64/devel exp +amd64-linux prefix/linux/amd64/devel exp x86-linux prefix/linux/x86/stable exp x86-linux prefix/linux/x86/stable/bindoc exp -x86-linux prefix/linux/x86/devel exp +x86-linux prefix/linux/x86/devel exp amd64-linux prefix/linux-standalone/amd64/stable exp amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp -amd64-linux prefix/linux-standalone/amd64/devel exp +amd64-linux prefix/linux-standalone/amd64/devel exp x86-linux prefix/linux-standalone/x86/stable exp x86-linux prefix/linux-standalone/x86/stable/bindoc exp -x86-linux prefix/linux-standalone/x86/devel exp +x86-linux prefix/linux-standalone/x86/devel exp diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors index 4ab5ad78c..8bafd5b75 100644 --- a/profiles/thirdpartymirrors +++ b/profiles/thirdpartymirrors @@ -1,2 +1,2 @@ -sageupstream http:/files.sagemath.org//spkg/upstream/ http:/ftp.riken.jp/sagemath/spkg/upstream/ http:/echidna.maths.usyd.edu.au/sage/spkg/upstream http:/www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream ftp:/ftp.fu-berlin.de/unix/misc/sage/spkg/upstream -sagemath http:/sagetrac.lipn.univ-paris13.fr/sage/ +sageupstream http://files.sagemath.org//spkg/upstream/ http://ftp.riken.jp/sagemath/spkg/upstream/ http://echidna.maths.usyd.edu.au/sage/spkg/upstream http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/upstream +sagemath http://sagetrac.lipn.univ-paris13.fr/sage/ From 59759db3bb9fedbc547f8ac6a661d4d3b405e4ff Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Fri, 2 Jun 2017 23:15:53 +0200 Subject: [PATCH 12/25] updating to the last master changes Changes to be committed: modified: profiles/package.mask modified: profiles/releases/devel/package.keywords --- profiles/package.mask | 2 -- profiles/releases/devel/package.keywords | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 6f8ccd9da..92bf6da36 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -4,5 +4,3 @@ sci-mathematics/ecm # testing only # Work in progress it doesn't like being installed in a root location #dev-gap/atlasrep -# Experimantal work in progress -=sci-libs/pynac-0.7.7-r100 diff --git a/profiles/releases/devel/package.keywords b/profiles/releases/devel/package.keywords index b90175a73..866363c60 100644 --- a/profiles/releases/devel/package.keywords +++ b/profiles/releases/devel/package.keywords @@ -15,7 +15,7 @@ dev-python/cvxopt ~dev-python/cython-0.25.2 ~dev-python/bottleneck-0.8.0 >=dev-python/matplotlib-1.5.1 -~dev-python/networkx-1.10 +~dev-python/networkx-1.11 ~dev-python/pyopenssl-0.14 ~dev-python/cryptography-0.6.1 ~dev-python/future-0.15.2 From f6b233933e9df018276cfcc744cee8f6e741253a Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Sun, 28 May 2017 18:36:32 +0200 Subject: [PATCH 13/25] profile support first part Changes to be committed: deleted: package.keywords/sage deleted: package.keywords/sage-7.5.1 deleted: package.keywords/sage-devel new file: profiles/default/devel/bindoc/parent new file: profiles/default/devel/parent new file: profiles/default/parent new file: profiles/default/stable/bindoc/parent new file: profiles/default/stable/parent renamed: package.use/99sage-bin-doc -> profiles/features/bindoc/package.use renamed: package.unmask/sage -> profiles/package.unmask new file: profiles/prefix/devel/bindoc/parent new file: profiles/prefix/devel/parent renamed: package.keywords/sage.prefix -> profiles/prefix/package.keywords new file: profiles/prefix/parent new file: profiles/prefix/stable/bindoc/parent new file: profiles/prefix/stable/parent renamed: package.keywords/sage-9999 -> profiles/releases/devel/package.keywords renamed: package.use/sage-unstable -> profiles/releases/devel/package.use new file: profiles/releases/devel/parent renamed: package.keywords/sage-7.6 -> profiles/releases/stable/package.keywords renamed: package.use/sage -> profiles/releases/stable/package.use --- package.keywords/sage | 1 - package.keywords/sage-7.5.1 | 188 ------------------ package.keywords/sage-devel | 1 - profiles/default/devel/bindoc/parent | 2 + profiles/default/devel/parent | 2 + profiles/default/parent | 1 + profiles/default/stable/bindoc/parent | 2 + profiles/default/stable/parent | 2 + .../features/bindoc/package.use | 0 .../sage => profiles/package.unmask | 0 profiles/prefix/devel/bindoc/parent | 2 + profiles/prefix/devel/parent | 2 + .../prefix/package.keywords | 0 profiles/prefix/parent | 1 + profiles/prefix/stable/bindoc/parent | 2 + profiles/prefix/stable/parent | 1 + .../releases/devel/package.keywords | 0 .../releases/devel/package.use | 0 profiles/releases/devel/parent | 1 + .../releases/stable/package.keywords | 0 .../releases/stable/package.use | 0 21 files changed, 18 insertions(+), 190 deletions(-) delete mode 120000 package.keywords/sage delete mode 100644 package.keywords/sage-7.5.1 delete mode 120000 package.keywords/sage-devel create mode 100644 profiles/default/devel/bindoc/parent create mode 100644 profiles/default/devel/parent create mode 100644 profiles/default/parent create mode 100644 profiles/default/stable/bindoc/parent create mode 100644 profiles/default/stable/parent rename package.use/99sage-bin-doc => profiles/features/bindoc/package.use (100%) rename package.unmask/sage => profiles/package.unmask (100%) create mode 100644 profiles/prefix/devel/bindoc/parent create mode 100644 profiles/prefix/devel/parent rename package.keywords/sage.prefix => profiles/prefix/package.keywords (100%) create mode 100644 profiles/prefix/parent create mode 100644 profiles/prefix/stable/bindoc/parent create mode 100644 profiles/prefix/stable/parent rename package.keywords/sage-9999 => profiles/releases/devel/package.keywords (100%) rename package.use/sage-unstable => profiles/releases/devel/package.use (100%) create mode 100644 profiles/releases/devel/parent rename package.keywords/sage-7.6 => profiles/releases/stable/package.keywords (100%) rename package.use/sage => profiles/releases/stable/package.use (100%) diff --git a/package.keywords/sage b/package.keywords/sage deleted file mode 120000 index 58987171d..000000000 --- a/package.keywords/sage +++ /dev/null @@ -1 +0,0 @@ -sage-7.6 \ No newline at end of file diff --git a/package.keywords/sage-7.5.1 b/package.keywords/sage-7.5.1 deleted file mode 100644 index 45581a65e..000000000 --- a/package.keywords/sage-7.5.1 +++ /dev/null @@ -1,188 +0,0 @@ -# app-emacs/imaxima-1.0-r3 is needed for >=maxima-5.29 -app-emacs/imaxima -dev-java/asm:2 -~dev-lang/R-3.2.0 -~dev-lang/python-2.7.10 ->=dev-libs/mathjax-2.5.0 -~dev-libs/mpc-1.0.2 ->=dev-libs/ntl-9.8.1 -~dev-libs/ppl-1.1 -dev-libs/c-blosc ->=dev-lisp/ecls-16.0.0::sage-on-gentoo -dev-python/characteristic -dev-python/cvxopt -~dev-python/cysignals-1.4.0 -~dev-python/cython-0.25.2::sage-on-gentoo -~dev-python/bottleneck-0.8.0 ->=dev-python/matplotlib-1.5.1 -~dev-python/networkx-1.10 -~dev-python/pyopenssl-0.14 -~dev-python/cryptography-0.6.1 -~dev-python/future-0.15.2 -dev-python/imagesize -dev-python/ptyprocess -~dev-python/python-dateutil-2.3 -~dev-python/python-openid-2.2.5 -~dev-python/flask-autoindex-0.5 -~dev-python/flask-babel-0.8 -~dev-python/flask-openid-1.2.4 -dev-python/flask-oldsessions -=dev-python/psutil-4.4* -~dev-python/flask-silk-0.2 -=dev-python/setuptools-20* -dev-python/terminado -dev-python/mistune -=dev-python/numpy-1.10*::sage-on-gentoo -dev-python/cycler -dev-python/versioneer -=dev-python/jedi-0.10* -dev-python/typing -=dev-python/ipython-5.3* ->=dev-python/notebook-4.1.0 ->=dev-python/ipywidgets-4.0.0 -dev-python/widgetsnbextension ->=dev-python/ipykernel-4.0.0 -=dev-python/nbformat-4.0* -=dev-python/path-py-7* ->=dev-python/ipyparallel-4.0.0 ->=dev-python/traitlets-4.1.0 -dev-python/entrypoints ->=dev-python/nbconvert-4.0.0 -dev-python/prompt_toolkit -dev-python/wcwidth -dev-python/backports-shutil_get_terminal_size -=dev-python/ipython_genutils-0.1* ->=dev-python/jupyter_core-4.0.0 ->=dev-python/jupyter_client-4.0.0 ->=dev-python/qtconsole-4.0.0 -dev-python/mpmath ->=dev-python/pexpect-4.0.1 -dev-python/pandas -dev-python/pyasn1-modules -~dev-python/pkgconfig-1.2.2 -~dev-python/pycurl-7.19.3.1 -~dev-python/pytz-2014.2 -~dev-python/pytables-3.1.1 -dev-python/rpy -dev-python/simplegeneric -~dev-python/speaklater-1.3 ->=dev-python/sympy-1.0 -=dev-python/twisted-names-15* -=dev-python/twisted-core-15* -=dev-python/twisted-mail-15* -=dev-python/twisted-web-15* -dev-python/webassets -~dev-python/werkzeug-0.9.6 -~dev-python/sphinx-1.4.1 -~dev-python/sphinx-1.4.4 -~dev-tex/sage-latex-3.0 -dev-tex/tkz-berge -dev-tex/tkz-graph -~media-gfx/tachyon-0.98.9 -sci-libs/cddlib -sci-libs/dsdp -~sci-libs/fflas-ffpack-2.2.2 -=sci-libs/fplll-5.0* -~dev-python/fpylll-0.2.3 -~sci-libs/givaro-4.0.2 ->=sci-libs/gsl-1.16 ->=sci-libs/iml-1.0.4 -~sci-mathematics/cliquer-1.21 -~sci-libs/libgap-4.8.3 -~sci-libs/linbox-1.4.2 -~sci-libs/m4ri-20140914 -~sci-libs/m4rie-20150908 -~sci-libs/mpfi-1.5.1 -~sci-libs/pynac-0.7.3 -~sci-libs/scipy-0.17.0 -sci-libs/symmetrica -sci-libs/vecmath-objectclub -sci-libs/zn_poly -~sci-mathematics/arb-2.8.1 -sci-mathematics/cu2 -sci-mathematics/cubex -sci-mathematics/dikcube ->=sci-mathematics/eclib-20150510 -~sci-mathematics/gmp-ecm-6.4.4 -sci-mathematics/flintqs -~sci-mathematics/flint-2.4.5 -~sci-mathematics/flint-2.5.2 -~sci-mathematics/gap-4.8.3 -=sci-mathematics/giac-1.2.2* -dev-gap/GAPDoc ->=sci-mathematics/glpk-4.54 ->=sci-mathematics/lcalc-1.23-r6 -sci-mathematics/lrcalc -~sci-mathematics/maxima-5.35.1::sage-on-gentoo -#~sci-mathematics/maxima-5.38.1::sage-on-gentoo -sci-mathematics/mcube -sci-mathematics/optimal -sci-mathematics/palp -~sci-mathematics/pari-2.8.0_alpha -sci-mathematics/pari-data -~sci-mathematics/planarity-2.2.0 -=sci-mathematics/brial-0.8* -~sci-mathematics/nauty-2.6.1 -sci-mathematics/ratpoints -sci-mathematics/rubiks -sci-mathematics/rw -~sci-mathematics/sage-7.5.1 -~sci-mathematics/sage-data-conway_polynomials-0.4 -~sci-mathematics/sage-data-combinatorial_designs-20140630 -~sci-mathematics/sage-data-elliptic_curves-0.8 -~sci-mathematics/sage-data-graphs-20161026 -~sci-mathematics/sage-data-polytopes_db-20120220 ->=sci-mathematics/sage-notebook-0.13 -~sci-mathematics/singular-4.1.0_p1 -sci-mathematics/sympow -~www-servers/tornado-3.1.1 -########################## -# optional dependencies -########################## -sci-mathematics/ExportSageNB -~sci-chemistry/sage-jmol-bin-14.2.11 -virtual/jre:1.7 -virtual/jdk:1.7 -dev-python/giacpy_sage -######################### -# sage optional binding -######################### -sci-libs/libbraiding -sci-libs/libhomfly -sci-libs/modular_decomposition -~sci-libs/bliss-0.73 -=sci-libs/cxsparse-3.1* -dev-libs/igraph -~dev-python/python-igraph-0.7.0 -# coinor-cbc -#sci-libs/coinor-clp -#sci-libs/coinor-dylp -#sci-libs/coinor-vol -#sci-libs/coinor-cgl -#sci-libs/coinor-utils -#sci-libs/coinor-osi -#sci-libs/coinor-cbc -##################### -# gap packages that can be used in sage -##################### -~dev-gap/aclib-1.2 -~dev-gap/Alnuth-3.0.0 -~dev-gap/autpgrp-1.5 -~dev-gap/crime-1.4 -~dev-gap/crystcat-1.1.6 -~dev-gap/ctbllib-1.2_p2 -~dev-gap/design-1.6 -~dev-gap/factint-1.5.3 -~dev-gap/grape-4.7 -~dev-gap/GUAVA-3.13 -~dev-gap/hap-1.11 -~dev-gap/HAPcryst-0.1.11 -~dev-gap/happrime-0.6 -~dev-gap/laguna-3.7.0 -~dev-gap/polycyclic-2.11 -~dev-gap/polymaking-0.8.1 -~dev-gap/sonata-2.8 -~dev-gap/cryst-4.1.12 -~dev-gap/toric-1.8 -~dev-gap/sage-meta-1.0 - diff --git a/package.keywords/sage-devel b/package.keywords/sage-devel deleted file mode 120000 index 5e5523272..000000000 --- a/package.keywords/sage-devel +++ /dev/null @@ -1 +0,0 @@ -sage-9999 \ No newline at end of file diff --git a/profiles/default/devel/bindoc/parent b/profiles/default/devel/bindoc/parent new file mode 100644 index 000000000..ba5510d6c --- /dev/null +++ b/profiles/default/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../features/bindoc diff --git a/profiles/default/devel/parent b/profiles/default/devel/parent new file mode 100644 index 000000000..b44592240 --- /dev/null +++ b/profiles/default/devel/parent @@ -0,0 +1,2 @@ +../ +../../targets/devel diff --git a/profiles/default/parent b/profiles/default/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/default/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/default/stable/bindoc/parent b/profiles/default/stable/bindoc/parent new file mode 100644 index 000000000..ba5510d6c --- /dev/null +++ b/profiles/default/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../features/bindoc diff --git a/profiles/default/stable/parent b/profiles/default/stable/parent new file mode 100644 index 000000000..93f7a1354 --- /dev/null +++ b/profiles/default/stable/parent @@ -0,0 +1,2 @@ +../ +../../targets/stable diff --git a/package.use/99sage-bin-doc b/profiles/features/bindoc/package.use similarity index 100% rename from package.use/99sage-bin-doc rename to profiles/features/bindoc/package.use diff --git a/package.unmask/sage b/profiles/package.unmask similarity index 100% rename from package.unmask/sage rename to profiles/package.unmask diff --git a/profiles/prefix/devel/bindoc/parent b/profiles/prefix/devel/bindoc/parent new file mode 100644 index 000000000..c9b6222f1 --- /dev/null +++ b/profiles/prefix/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../features/bindoc diff --git a/profiles/prefix/devel/parent b/profiles/prefix/devel/parent new file mode 100644 index 000000000..b0a0bb9f5 --- /dev/null +++ b/profiles/prefix/devel/parent @@ -0,0 +1,2 @@ +../ +../stable diff --git a/package.keywords/sage.prefix b/profiles/prefix/package.keywords similarity index 100% rename from package.keywords/sage.prefix rename to profiles/prefix/package.keywords diff --git a/profiles/prefix/parent b/profiles/prefix/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/stable/bindoc/parent b/profiles/prefix/stable/bindoc/parent new file mode 100644 index 000000000..c9b6222f1 --- /dev/null +++ b/profiles/prefix/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../features/bindoc diff --git a/profiles/prefix/stable/parent b/profiles/prefix/stable/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/stable/parent @@ -0,0 +1 @@ +../ diff --git a/package.keywords/sage-9999 b/profiles/releases/devel/package.keywords similarity index 100% rename from package.keywords/sage-9999 rename to profiles/releases/devel/package.keywords diff --git a/package.use/sage-unstable b/profiles/releases/devel/package.use similarity index 100% rename from package.use/sage-unstable rename to profiles/releases/devel/package.use diff --git a/profiles/releases/devel/parent b/profiles/releases/devel/parent new file mode 100644 index 000000000..b39562b4b --- /dev/null +++ b/profiles/releases/devel/parent @@ -0,0 +1 @@ +../stable diff --git a/package.keywords/sage-7.6 b/profiles/releases/stable/package.keywords similarity index 100% rename from package.keywords/sage-7.6 rename to profiles/releases/stable/package.keywords diff --git a/package.use/sage b/profiles/releases/stable/package.use similarity index 100% rename from package.use/sage rename to profiles/releases/stable/package.use From 03ef3c282a30ff60f0bbcc52a266e96127be25ce Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Sun, 28 May 2017 18:40:12 +0200 Subject: [PATCH 14/25] removed redundant parent Changes to be committed: modified: profiles/prefix/devel/parent --- profiles/prefix/devel/parent | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/prefix/devel/parent b/profiles/prefix/devel/parent index b0a0bb9f5..eb4d9056a 100644 --- a/profiles/prefix/devel/parent +++ b/profiles/prefix/devel/parent @@ -1,2 +1 @@ ../ -../stable From 738bf8225d671571d6d5efc5741a0eecb8f48a72 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Sun, 28 May 2017 19:02:12 +0200 Subject: [PATCH 15/25] added architectures to the prefix profiles Changes to be committed: deleted: profiles/prefix/devel/bindoc/parent new file: profiles/prefix/linux/amd64/devel/bindoc/parent new file: profiles/prefix/linux/amd64/devel/parent renamed: profiles/prefix/devel/parent -> profiles/prefix/linux/amd64/parent new file: profiles/prefix/linux/amd64/stable/bindoc/parent new file: profiles/prefix/linux/amd64/stable/parent renamed: profiles/prefix/stable/parent -> profiles/prefix/linux/parent new file: profiles/prefix/linux/x86/devel/bindoc/parent new file: profiles/prefix/linux/x86/devel/parent new file: profiles/prefix/linux/x86/parent new file: profiles/prefix/linux/x86/stable/bindoc/parent new file: profiles/prefix/linux/x86/stable/parent deleted: profiles/prefix/stable/bindoc/parent new file: profiles/profiles.desc --- profiles/prefix/devel/bindoc/parent | 2 -- profiles/prefix/linux/amd64/devel/bindoc/parent | 2 ++ profiles/prefix/linux/amd64/devel/parent | 2 ++ profiles/prefix/{devel => linux/amd64}/parent | 0 profiles/prefix/linux/amd64/stable/bindoc/parent | 2 ++ profiles/prefix/linux/amd64/stable/parent | 2 ++ profiles/prefix/{stable => linux}/parent | 0 profiles/prefix/linux/x86/devel/bindoc/parent | 2 ++ profiles/prefix/linux/x86/devel/parent | 2 ++ profiles/prefix/linux/x86/parent | 1 + profiles/prefix/linux/x86/stable/bindoc/parent | 2 ++ profiles/prefix/linux/x86/stable/parent | 2 ++ profiles/prefix/stable/bindoc/parent | 2 -- profiles/profiles.desc | 4 ++++ 14 files changed, 21 insertions(+), 4 deletions(-) delete mode 100644 profiles/prefix/devel/bindoc/parent create mode 100644 profiles/prefix/linux/amd64/devel/bindoc/parent create mode 100644 profiles/prefix/linux/amd64/devel/parent rename profiles/prefix/{devel => linux/amd64}/parent (100%) create mode 100644 profiles/prefix/linux/amd64/stable/bindoc/parent create mode 100644 profiles/prefix/linux/amd64/stable/parent rename profiles/prefix/{stable => linux}/parent (100%) create mode 100644 profiles/prefix/linux/x86/devel/bindoc/parent create mode 100644 profiles/prefix/linux/x86/devel/parent create mode 100644 profiles/prefix/linux/x86/parent create mode 100644 profiles/prefix/linux/x86/stable/bindoc/parent create mode 100644 profiles/prefix/linux/x86/stable/parent delete mode 100644 profiles/prefix/stable/bindoc/parent create mode 100644 profiles/profiles.desc diff --git a/profiles/prefix/devel/bindoc/parent b/profiles/prefix/devel/bindoc/parent deleted file mode 100644 index c9b6222f1..000000000 --- a/profiles/prefix/devel/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../features/bindoc diff --git a/profiles/prefix/linux/amd64/devel/bindoc/parent b/profiles/prefix/linux/amd64/devel/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux/amd64/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux/amd64/devel/parent b/profiles/prefix/linux/amd64/devel/parent new file mode 100644 index 000000000..b29a8daf0 --- /dev/null +++ b/profiles/prefix/linux/amd64/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/devel diff --git a/profiles/prefix/devel/parent b/profiles/prefix/linux/amd64/parent similarity index 100% rename from profiles/prefix/devel/parent rename to profiles/prefix/linux/amd64/parent diff --git a/profiles/prefix/linux/amd64/stable/bindoc/parent b/profiles/prefix/linux/amd64/stable/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux/amd64/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux/amd64/stable/parent b/profiles/prefix/linux/amd64/stable/parent new file mode 100644 index 000000000..ed4d3b86e --- /dev/null +++ b/profiles/prefix/linux/amd64/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/stable diff --git a/profiles/prefix/stable/parent b/profiles/prefix/linux/parent similarity index 100% rename from profiles/prefix/stable/parent rename to profiles/prefix/linux/parent diff --git a/profiles/prefix/linux/x86/devel/bindoc/parent b/profiles/prefix/linux/x86/devel/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux/x86/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux/x86/devel/parent b/profiles/prefix/linux/x86/devel/parent new file mode 100644 index 000000000..b29a8daf0 --- /dev/null +++ b/profiles/prefix/linux/x86/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/devel diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/linux/x86/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/linux/x86/stable/bindoc/parent b/profiles/prefix/linux/x86/stable/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux/x86/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux/x86/stable/parent b/profiles/prefix/linux/x86/stable/parent new file mode 100644 index 000000000..ed4d3b86e --- /dev/null +++ b/profiles/prefix/linux/x86/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/stable diff --git a/profiles/prefix/stable/bindoc/parent b/profiles/prefix/stable/bindoc/parent deleted file mode 100644 index c9b6222f1..000000000 --- a/profiles/prefix/stable/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../features/bindoc diff --git a/profiles/profiles.desc b/profiles/profiles.desc new file mode 100644 index 000000000..5deb5d6ff --- /dev/null +++ b/profiles/profiles.desc @@ -0,0 +1,4 @@ +amd64-linux prefix/linux/amd64/stable exp +x86-linux prefix/linux/x86/devel exp +amd64-linux prefix/linux/amd64/stable/bindoc exp +x86-linux prefix/linux/x86/devel/bindoc exp From 8fbd705f128f633befe9088b86ecad73fd50180f Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Sun, 28 May 2017 19:09:18 +0200 Subject: [PATCH 16/25] added linux-standalone prefix to profile Changes to be committed: new file: profiles/prefix/linux-standalone/amd64/devel/bindoc/parent new file: profiles/prefix/linux-standalone/amd64/devel/parent new file: profiles/prefix/linux-standalone/amd64/parent new file: profiles/prefix/linux-standalone/amd64/stable/bindoc/parent new file: profiles/prefix/linux-standalone/amd64/stable/parent new file: profiles/prefix/linux-standalone/parent new file: profiles/prefix/linux-standalone/x86/devel/bindoc/parent new file: profiles/prefix/linux-standalone/x86/devel/parent new file: profiles/prefix/linux-standalone/x86/parent new file: profiles/prefix/linux-standalone/x86/stable/bindoc/parent new file: profiles/prefix/linux-standalone/x86/stable/parent modified: profiles/profiles.desc --- .../linux-standalone/amd64/devel/bindoc/parent | 2 ++ profiles/prefix/linux-standalone/amd64/devel/parent | 2 ++ profiles/prefix/linux-standalone/amd64/parent | 1 + .../linux-standalone/amd64/stable/bindoc/parent | 2 ++ .../prefix/linux-standalone/amd64/stable/parent | 2 ++ profiles/prefix/linux-standalone/parent | 1 + .../prefix/linux-standalone/x86/devel/bindoc/parent | 2 ++ profiles/prefix/linux-standalone/x86/devel/parent | 2 ++ profiles/prefix/linux-standalone/x86/parent | 1 + .../linux-standalone/x86/stable/bindoc/parent | 2 ++ profiles/prefix/linux-standalone/x86/stable/parent | 2 ++ profiles/profiles.desc | 13 +++++++++---- 12 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 profiles/prefix/linux-standalone/amd64/devel/bindoc/parent create mode 100644 profiles/prefix/linux-standalone/amd64/devel/parent create mode 100644 profiles/prefix/linux-standalone/amd64/parent create mode 100644 profiles/prefix/linux-standalone/amd64/stable/bindoc/parent create mode 100644 profiles/prefix/linux-standalone/amd64/stable/parent create mode 100644 profiles/prefix/linux-standalone/parent create mode 100644 profiles/prefix/linux-standalone/x86/devel/bindoc/parent create mode 100644 profiles/prefix/linux-standalone/x86/devel/parent create mode 100644 profiles/prefix/linux-standalone/x86/parent create mode 100644 profiles/prefix/linux-standalone/x86/stable/bindoc/parent create mode 100644 profiles/prefix/linux-standalone/x86/stable/parent diff --git a/profiles/prefix/linux-standalone/amd64/devel/bindoc/parent b/profiles/prefix/linux-standalone/amd64/devel/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux-standalone/amd64/devel/parent b/profiles/prefix/linux-standalone/amd64/devel/parent new file mode 100644 index 000000000..b29a8daf0 --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/devel diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux-standalone/amd64/stable/parent b/profiles/prefix/linux-standalone/amd64/stable/parent new file mode 100644 index 000000000..ed4d3b86e --- /dev/null +++ b/profiles/prefix/linux-standalone/amd64/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/stable diff --git a/profiles/prefix/linux-standalone/parent b/profiles/prefix/linux-standalone/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/linux-standalone/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/linux-standalone/x86/devel/bindoc/parent b/profiles/prefix/linux-standalone/x86/devel/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/devel/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux-standalone/x86/devel/parent b/profiles/prefix/linux-standalone/x86/devel/parent new file mode 100644 index 000000000..b29a8daf0 --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/devel diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/prefix/linux-standalone/x86/stable/bindoc/parent b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent new file mode 100644 index 000000000..5ced07da2 --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../features/bindoc diff --git a/profiles/prefix/linux-standalone/x86/stable/parent b/profiles/prefix/linux-standalone/x86/stable/parent new file mode 100644 index 000000000..ed4d3b86e --- /dev/null +++ b/profiles/prefix/linux-standalone/x86/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../releases/stable diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 5deb5d6ff..07a1cfacc 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -1,4 +1,9 @@ -amd64-linux prefix/linux/amd64/stable exp -x86-linux prefix/linux/x86/devel exp -amd64-linux prefix/linux/amd64/stable/bindoc exp -x86-linux prefix/linux/x86/devel/bindoc exp +amd64-linux prefix/linux/amd64/stable exp +x86-linux prefix/linux/x86/devel exp +amd64-linux prefix/linux/amd64/stable/bindoc exp +x86-linux prefix/linux/x86/devel/bindoc exp + +amd64-linux prefix/linux-standalone/amd64/stable exp +x86-linux prefix/linux-standalone/x86/devel exp +amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp +x86-linux prefix/linux-standalone/x86/devel/bindoc exp From 242f6f4331ce0ab5c0c2417f259f8d8d340e0dff Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Mon, 29 May 2017 14:57:51 +0200 Subject: [PATCH 17/25] add profiles part 2 (x86 and amd64) --- profiles/default/devel/bindoc/parent | 2 -- profiles/default/devel/parent | 2 -- profiles/default/linux/amd64/devel/parent | 2 ++ profiles/default/linux/amd64/parent | 2 ++ .../linux/amd64/stable}/bindoc/parent | 0 profiles/default/linux/amd64/stable/parent | 2 ++ profiles/default/linux/parent | 1 + profiles/default/linux/x86/devel/parent | 2 ++ profiles/default/linux/x86/parent | 2 ++ .../linux/x86/stable}/bindoc/parent | 0 profiles/default/linux/x86/stable/parent | 2 ++ profiles/default/stable/bindoc/parent | 2 -- profiles/default/stable/parent | 2 -- profiles/prefix/linux-standalone/amd64/parent | 1 + profiles/prefix/linux-standalone/x86/parent | 1 + .../prefix/linux/amd64/devel/bindoc/parent | 2 -- profiles/prefix/linux/amd64/parent | 1 + profiles/prefix/linux/x86/devel/bindoc/parent | 2 -- profiles/prefix/linux/x86/parent | 1 + profiles/profiles.desc | 27 ++++++++++++------- 20 files changed, 35 insertions(+), 21 deletions(-) delete mode 100644 profiles/default/devel/bindoc/parent delete mode 100644 profiles/default/devel/parent create mode 100644 profiles/default/linux/amd64/devel/parent create mode 100644 profiles/default/linux/amd64/parent rename profiles/{prefix/linux-standalone/amd64/devel => default/linux/amd64/stable}/bindoc/parent (100%) create mode 100644 profiles/default/linux/amd64/stable/parent create mode 100644 profiles/default/linux/parent create mode 100644 profiles/default/linux/x86/devel/parent create mode 100644 profiles/default/linux/x86/parent rename profiles/{prefix/linux-standalone/x86/devel => default/linux/x86/stable}/bindoc/parent (100%) create mode 100644 profiles/default/linux/x86/stable/parent delete mode 100644 profiles/default/stable/bindoc/parent delete mode 100644 profiles/default/stable/parent delete mode 100644 profiles/prefix/linux/amd64/devel/bindoc/parent delete mode 100644 profiles/prefix/linux/x86/devel/bindoc/parent diff --git a/profiles/default/devel/bindoc/parent b/profiles/default/devel/bindoc/parent deleted file mode 100644 index ba5510d6c..000000000 --- a/profiles/default/devel/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../features/bindoc diff --git a/profiles/default/devel/parent b/profiles/default/devel/parent deleted file mode 100644 index b44592240..000000000 --- a/profiles/default/devel/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../targets/devel diff --git a/profiles/default/linux/amd64/devel/parent b/profiles/default/linux/amd64/devel/parent new file mode 100644 index 000000000..8462268b9 --- /dev/null +++ b/profiles/default/linux/amd64/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../targets/devel diff --git a/profiles/default/linux/amd64/parent b/profiles/default/linux/amd64/parent new file mode 100644 index 000000000..e3b3f9c28 --- /dev/null +++ b/profiles/default/linux/amd64/parent @@ -0,0 +1,2 @@ +../ +../../../arch/amd64 diff --git a/profiles/prefix/linux-standalone/amd64/devel/bindoc/parent b/profiles/default/linux/amd64/stable/bindoc/parent similarity index 100% rename from profiles/prefix/linux-standalone/amd64/devel/bindoc/parent rename to profiles/default/linux/amd64/stable/bindoc/parent diff --git a/profiles/default/linux/amd64/stable/parent b/profiles/default/linux/amd64/stable/parent new file mode 100644 index 000000000..0baa66cc8 --- /dev/null +++ b/profiles/default/linux/amd64/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../targets/stable diff --git a/profiles/default/linux/parent b/profiles/default/linux/parent new file mode 100644 index 000000000..eb4d9056a --- /dev/null +++ b/profiles/default/linux/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/default/linux/x86/devel/parent b/profiles/default/linux/x86/devel/parent new file mode 100644 index 000000000..8462268b9 --- /dev/null +++ b/profiles/default/linux/x86/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../targets/devel diff --git a/profiles/default/linux/x86/parent b/profiles/default/linux/x86/parent new file mode 100644 index 000000000..80e3640ef --- /dev/null +++ b/profiles/default/linux/x86/parent @@ -0,0 +1,2 @@ +../ +../../../arch/x86 diff --git a/profiles/prefix/linux-standalone/x86/devel/bindoc/parent b/profiles/default/linux/x86/stable/bindoc/parent similarity index 100% rename from profiles/prefix/linux-standalone/x86/devel/bindoc/parent rename to profiles/default/linux/x86/stable/bindoc/parent diff --git a/profiles/default/linux/x86/stable/parent b/profiles/default/linux/x86/stable/parent new file mode 100644 index 000000000..0baa66cc8 --- /dev/null +++ b/profiles/default/linux/x86/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../targets/stable diff --git a/profiles/default/stable/bindoc/parent b/profiles/default/stable/bindoc/parent deleted file mode 100644 index ba5510d6c..000000000 --- a/profiles/default/stable/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../features/bindoc diff --git a/profiles/default/stable/parent b/profiles/default/stable/parent deleted file mode 100644 index 93f7a1354..000000000 --- a/profiles/default/stable/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../targets/stable diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent index eb4d9056a..e3b3f9c28 100644 --- a/profiles/prefix/linux-standalone/amd64/parent +++ b/profiles/prefix/linux-standalone/amd64/parent @@ -1 +1,2 @@ ../ +../../../arch/amd64 diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent index eb4d9056a..e3b3f9c28 100644 --- a/profiles/prefix/linux-standalone/x86/parent +++ b/profiles/prefix/linux-standalone/x86/parent @@ -1 +1,2 @@ ../ +../../../arch/amd64 diff --git a/profiles/prefix/linux/amd64/devel/bindoc/parent b/profiles/prefix/linux/amd64/devel/bindoc/parent deleted file mode 100644 index 5ced07da2..000000000 --- a/profiles/prefix/linux/amd64/devel/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../../features/bindoc diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent index eb4d9056a..e3b3f9c28 100644 --- a/profiles/prefix/linux/amd64/parent +++ b/profiles/prefix/linux/amd64/parent @@ -1 +1,2 @@ ../ +../../../arch/amd64 diff --git a/profiles/prefix/linux/x86/devel/bindoc/parent b/profiles/prefix/linux/x86/devel/bindoc/parent deleted file mode 100644 index 5ced07da2..000000000 --- a/profiles/prefix/linux/x86/devel/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../../features/bindoc diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent index eb4d9056a..80e3640ef 100644 --- a/profiles/prefix/linux/x86/parent +++ b/profiles/prefix/linux/x86/parent @@ -1 +1,2 @@ ../ +../../../arch/x86 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 07a1cfacc..60aa3cdac 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -1,9 +1,18 @@ -amd64-linux prefix/linux/amd64/stable exp -x86-linux prefix/linux/x86/devel exp -amd64-linux prefix/linux/amd64/stable/bindoc exp -x86-linux prefix/linux/x86/devel/bindoc exp - -amd64-linux prefix/linux-standalone/amd64/stable exp -x86-linux prefix/linux-standalone/x86/devel exp -amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp -x86-linux prefix/linux-standalone/x86/devel/bindoc exp +amd64 default/linux/amd64/stable stable +amd64 default/linux/amd64/stable/bindoc stable +amd64 default/linux/amd64/devel dev +x86 default/linux/x86/stable stable +x86 default/linux/x86/stable/bindoc stable +x86 default/linux/x86/devel dev +amd64-linux prefix/linux/amd64/stable exp +amd64-linux prefix/linux/amd64/stable/bindoc exp +amd64-linux prefix/linux/amd64/devel exp +x86-linux prefix/linux/x86/stable exp +x86-linux prefix/linux/x86/stable/bindoc exp +x86-linux prefix/linux/x86/devel exp +amd64-linux prefix/linux-standalone/amd64/stable exp +amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp +amd64-linux prefix/linux-standalone/amd64/devel exp +x86-linux prefix/linux-standalone/x86/stable exp +x86-linux prefix/linux-standalone/x86/stable/bindoc exp +x86-linux prefix/linux-standalone/x86/devel exp From 738aac23dddaa233665038c3c4408670af2e000b Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Thu, 1 Jun 2017 14:31:07 +0200 Subject: [PATCH 18/25] standalone profiles Changes to be committed: new file: profiles/default/linux/amd64/13.0/devel/parent new file: profiles/default/linux/amd64/13.0/parent new file: profiles/default/linux/amd64/13.0/stable/bindoc/parent new file: profiles/default/linux/amd64/13.0/stable/parent deleted: profiles/default/linux/amd64/devel/parent deleted: profiles/default/linux/amd64/stable/bindoc/parent deleted: profiles/default/linux/amd64/stable/parent new file: profiles/default/linux/x86/13.0/devel/parent new file: profiles/default/linux/x86/13.0/parent new file: profiles/default/linux/x86/13.0/stable/bindoc/parent new file: profiles/default/linux/x86/13.0/stable/parent deleted: profiles/default/linux/x86/devel/parent deleted: profiles/default/linux/x86/stable/bindoc/parent deleted: profiles/default/linux/x86/stable/parent modified: profiles/prefix/linux-standalone/amd64/parent modified: profiles/prefix/linux-standalone/x86/parent modified: profiles/prefix/linux/amd64/parent modified: profiles/prefix/linux/x86/parent modified: profiles/profiles.desc --- .../default/linux/amd64/13.0/devel/parent | 2 ++ profiles/default/linux/amd64/13.0/parent | 2 ++ .../linux/amd64/13.0/stable/bindoc/parent | 2 ++ .../default/linux/amd64/13.0/stable/parent | 2 ++ profiles/default/linux/amd64/devel/parent | 2 -- .../default/linux/amd64/stable/bindoc/parent | 2 -- profiles/default/linux/amd64/stable/parent | 2 -- profiles/default/linux/x86/13.0/devel/parent | 2 ++ profiles/default/linux/x86/13.0/parent | 2 ++ .../linux/x86/13.0/stable/bindoc/parent | 2 ++ profiles/default/linux/x86/13.0/stable/parent | 2 ++ profiles/default/linux/x86/devel/parent | 2 -- .../default/linux/x86/stable/bindoc/parent | 2 -- profiles/default/linux/x86/stable/parent | 2 -- profiles/prefix/linux-standalone/amd64/parent | 1 + profiles/prefix/linux-standalone/x86/parent | 1 + profiles/prefix/linux/amd64/parent | 1 + profiles/prefix/linux/x86/parent | 1 + profiles/profiles.desc | 20 +++++++++---------- 19 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 profiles/default/linux/amd64/13.0/devel/parent create mode 100644 profiles/default/linux/amd64/13.0/parent create mode 100644 profiles/default/linux/amd64/13.0/stable/bindoc/parent create mode 100644 profiles/default/linux/amd64/13.0/stable/parent delete mode 100644 profiles/default/linux/amd64/devel/parent delete mode 100644 profiles/default/linux/amd64/stable/bindoc/parent delete mode 100644 profiles/default/linux/amd64/stable/parent create mode 100644 profiles/default/linux/x86/13.0/devel/parent create mode 100644 profiles/default/linux/x86/13.0/parent create mode 100644 profiles/default/linux/x86/13.0/stable/bindoc/parent create mode 100644 profiles/default/linux/x86/13.0/stable/parent delete mode 100644 profiles/default/linux/x86/devel/parent delete mode 100644 profiles/default/linux/x86/stable/bindoc/parent delete mode 100644 profiles/default/linux/x86/stable/parent diff --git a/profiles/default/linux/amd64/13.0/devel/parent b/profiles/default/linux/amd64/13.0/devel/parent new file mode 100644 index 000000000..7cb4764a0 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../../targets/devel diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent new file mode 100644 index 000000000..f49cf11b1 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/amd64/13.0 +../ diff --git a/profiles/default/linux/amd64/13.0/stable/bindoc/parent b/profiles/default/linux/amd64/13.0/stable/bindoc/parent new file mode 100644 index 000000000..5c37a31e0 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../../features/bindoc diff --git a/profiles/default/linux/amd64/13.0/stable/parent b/profiles/default/linux/amd64/13.0/stable/parent new file mode 100644 index 000000000..9f7330b42 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../../targets/stable diff --git a/profiles/default/linux/amd64/devel/parent b/profiles/default/linux/amd64/devel/parent deleted file mode 100644 index 8462268b9..000000000 --- a/profiles/default/linux/amd64/devel/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../targets/devel diff --git a/profiles/default/linux/amd64/stable/bindoc/parent b/profiles/default/linux/amd64/stable/bindoc/parent deleted file mode 100644 index 5ced07da2..000000000 --- a/profiles/default/linux/amd64/stable/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../../features/bindoc diff --git a/profiles/default/linux/amd64/stable/parent b/profiles/default/linux/amd64/stable/parent deleted file mode 100644 index 0baa66cc8..000000000 --- a/profiles/default/linux/amd64/stable/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../targets/stable diff --git a/profiles/default/linux/x86/13.0/devel/parent b/profiles/default/linux/x86/13.0/devel/parent new file mode 100644 index 000000000..7cb4764a0 --- /dev/null +++ b/profiles/default/linux/x86/13.0/devel/parent @@ -0,0 +1,2 @@ +../ +../../../../../targets/devel diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent new file mode 100644 index 000000000..f49cf11b1 --- /dev/null +++ b/profiles/default/linux/x86/13.0/parent @@ -0,0 +1,2 @@ +gentoo:default/linux/amd64/13.0 +../ diff --git a/profiles/default/linux/x86/13.0/stable/bindoc/parent b/profiles/default/linux/x86/13.0/stable/bindoc/parent new file mode 100644 index 000000000..5c37a31e0 --- /dev/null +++ b/profiles/default/linux/x86/13.0/stable/bindoc/parent @@ -0,0 +1,2 @@ +../ +../../../../../../features/bindoc diff --git a/profiles/default/linux/x86/13.0/stable/parent b/profiles/default/linux/x86/13.0/stable/parent new file mode 100644 index 000000000..9f7330b42 --- /dev/null +++ b/profiles/default/linux/x86/13.0/stable/parent @@ -0,0 +1,2 @@ +../ +../../../../../targets/stable diff --git a/profiles/default/linux/x86/devel/parent b/profiles/default/linux/x86/devel/parent deleted file mode 100644 index 8462268b9..000000000 --- a/profiles/default/linux/x86/devel/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../targets/devel diff --git a/profiles/default/linux/x86/stable/bindoc/parent b/profiles/default/linux/x86/stable/bindoc/parent deleted file mode 100644 index 5ced07da2..000000000 --- a/profiles/default/linux/x86/stable/bindoc/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../../features/bindoc diff --git a/profiles/default/linux/x86/stable/parent b/profiles/default/linux/x86/stable/parent deleted file mode 100644 index 0baa66cc8..000000000 --- a/profiles/default/linux/x86/stable/parent +++ /dev/null @@ -1,2 +0,0 @@ -../ -../../../../targets/stable diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent index e3b3f9c28..6594684d1 100644 --- a/profiles/prefix/linux-standalone/amd64/parent +++ b/profiles/prefix/linux-standalone/amd64/parent @@ -1,2 +1,3 @@ +gentoo:prefix/linux-standalone/x86 ../ ../../../arch/amd64 diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent index e3b3f9c28..6594684d1 100644 --- a/profiles/prefix/linux-standalone/x86/parent +++ b/profiles/prefix/linux-standalone/x86/parent @@ -1,2 +1,3 @@ +gentoo:prefix/linux-standalone/x86 ../ ../../../arch/amd64 diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent index e3b3f9c28..02055a081 100644 --- a/profiles/prefix/linux/amd64/parent +++ b/profiles/prefix/linux/amd64/parent @@ -1,2 +1,3 @@ +gentoo:prefix/linux/amd64 ../ ../../../arch/amd64 diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent index 80e3640ef..21a83f841 100644 --- a/profiles/prefix/linux/x86/parent +++ b/profiles/prefix/linux/x86/parent @@ -1,2 +1,3 @@ +prefix/linux/x86 ../ ../../../arch/x86 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 60aa3cdac..70172898f 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -1,18 +1,18 @@ -amd64 default/linux/amd64/stable stable -amd64 default/linux/amd64/stable/bindoc stable -amd64 default/linux/amd64/devel dev -x86 default/linux/x86/stable stable -x86 default/linux/x86/stable/bindoc stable -x86 default/linux/x86/devel dev +amd64 default/linux/amd64/13.0/stable stable +amd64 default/linux/amd64/13.0/stable/bindoc stable +amd64 default/linux/amd64/13.0/devel dev +x86 default/linux/x86/13.0/stable stable +x86 default/linux/x86/13.0/stable/bindoc stable +x86 default/linux/x86/13.0/devel dev amd64-linux prefix/linux/amd64/stable exp amd64-linux prefix/linux/amd64/stable/bindoc exp -amd64-linux prefix/linux/amd64/devel exp +amd64-linux prefix/linux/amd64/devel exp x86-linux prefix/linux/x86/stable exp x86-linux prefix/linux/x86/stable/bindoc exp -x86-linux prefix/linux/x86/devel exp +x86-linux prefix/linux/x86/devel exp amd64-linux prefix/linux-standalone/amd64/stable exp amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp -amd64-linux prefix/linux-standalone/amd64/devel exp +amd64-linux prefix/linux-standalone/amd64/devel exp x86-linux prefix/linux-standalone/x86/stable exp x86-linux prefix/linux-standalone/x86/stable/bindoc exp -x86-linux prefix/linux-standalone/x86/devel exp +x86-linux prefix/linux-standalone/x86/devel exp From 80eb5a3ec55b9ac77d03a0529b32505042c374f4 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Thu, 1 Jun 2017 16:43:06 +0200 Subject: [PATCH 19/25] absolute paths instead of relative Changes to be committed: modified: profiles/default/linux/amd64/13.0/devel/parent modified: profiles/default/linux/amd64/13.0/parent modified: profiles/default/linux/amd64/13.0/stable/bindoc/parent modified: profiles/default/linux/amd64/13.0/stable/parent modified: profiles/default/linux/amd64/parent modified: profiles/default/linux/parent modified: profiles/default/linux/x86/13.0/devel/parent modified: profiles/default/linux/x86/13.0/parent modified: profiles/default/linux/x86/13.0/stable/bindoc/parent modified: profiles/default/linux/x86/13.0/stable/parent modified: profiles/default/linux/x86/parent modified: profiles/default/parent modified: profiles/prefix/linux-standalone/amd64/devel/parent modified: profiles/prefix/linux-standalone/amd64/parent modified: profiles/prefix/linux-standalone/amd64/stable/bindoc/parent modified: profiles/prefix/linux-standalone/amd64/stable/parent modified: profiles/prefix/linux-standalone/parent modified: profiles/prefix/linux-standalone/x86/devel/parent modified: profiles/prefix/linux-standalone/x86/parent modified: profiles/prefix/linux-standalone/x86/stable/bindoc/parent modified: profiles/prefix/linux-standalone/x86/stable/parent modified: profiles/prefix/linux/amd64/devel/parent modified: profiles/prefix/linux/amd64/parent modified: profiles/prefix/linux/amd64/stable/bindoc/parent modified: profiles/prefix/linux/amd64/stable/parent modified: profiles/prefix/linux/parent modified: profiles/prefix/linux/x86/devel/parent modified: profiles/prefix/linux/x86/parent modified: profiles/prefix/linux/x86/stable/bindoc/parent modified: profiles/prefix/linux/x86/stable/parent modified: profiles/prefix/parent modified: profiles/thirdpartymirrors --- profiles/default/linux/amd64/13.0/devel/parent | 4 ++-- profiles/default/linux/amd64/13.0/parent | 2 +- profiles/default/linux/amd64/13.0/stable/bindoc/parent | 4 ++-- profiles/default/linux/amd64/13.0/stable/parent | 4 ++-- profiles/default/linux/amd64/parent | 4 ++-- profiles/default/linux/parent | 2 +- profiles/default/linux/x86/13.0/devel/parent | 4 ++-- profiles/default/linux/x86/13.0/parent | 2 +- profiles/default/linux/x86/13.0/stable/bindoc/parent | 4 ++-- profiles/default/linux/x86/13.0/stable/parent | 4 ++-- profiles/default/linux/x86/parent | 3 +-- profiles/default/parent | 2 +- profiles/prefix/linux-standalone/amd64/devel/parent | 4 ++-- profiles/prefix/linux-standalone/amd64/parent | 6 +++--- profiles/prefix/linux-standalone/amd64/stable/bindoc/parent | 4 ++-- profiles/prefix/linux-standalone/amd64/stable/parent | 4 ++-- profiles/prefix/linux-standalone/parent | 2 +- profiles/prefix/linux-standalone/x86/devel/parent | 4 ++-- profiles/prefix/linux-standalone/x86/parent | 4 ++-- profiles/prefix/linux-standalone/x86/stable/bindoc/parent | 4 ++-- profiles/prefix/linux-standalone/x86/stable/parent | 4 ++-- profiles/prefix/linux/amd64/devel/parent | 4 ++-- profiles/prefix/linux/amd64/parent | 4 ++-- profiles/prefix/linux/amd64/stable/bindoc/parent | 4 ++-- profiles/prefix/linux/amd64/stable/parent | 4 ++-- profiles/prefix/linux/parent | 2 +- profiles/prefix/linux/x86/devel/parent | 4 ++-- profiles/prefix/linux/x86/parent | 6 +++--- profiles/prefix/linux/x86/stable/bindoc/parent | 4 ++-- profiles/prefix/linux/x86/stable/parent | 4 ++-- profiles/prefix/parent | 2 +- profiles/thirdpartymirrors | 4 ++-- 32 files changed, 58 insertions(+), 59 deletions(-) diff --git a/profiles/default/linux/amd64/13.0/devel/parent b/profiles/default/linux/amd64/13.0/devel/parent index 7cb4764a0..bbb6d7897 100644 --- a/profiles/default/linux/amd64/13.0/devel/parent +++ b/profiles/default/linux/amd64/13.0/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../../targets/devel +.. +sage-on-gentoo:targets/devel diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent index f49cf11b1..f1f056c2f 100644 --- a/profiles/default/linux/amd64/13.0/parent +++ b/profiles/default/linux/amd64/13.0/parent @@ -1,2 +1,2 @@ gentoo:default/linux/amd64/13.0 -../ +.. diff --git a/profiles/default/linux/amd64/13.0/stable/bindoc/parent b/profiles/default/linux/amd64/13.0/stable/bindoc/parent index 5c37a31e0..bc5747dda 100644 --- a/profiles/default/linux/amd64/13.0/stable/bindoc/parent +++ b/profiles/default/linux/amd64/13.0/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/default/linux/amd64/13.0/stable/parent b/profiles/default/linux/amd64/13.0/stable/parent index 9f7330b42..5a30aad9e 100644 --- a/profiles/default/linux/amd64/13.0/stable/parent +++ b/profiles/default/linux/amd64/13.0/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../../targets/stable +.. +sage-on-gentoo:targets/stable diff --git a/profiles/default/linux/amd64/parent b/profiles/default/linux/amd64/parent index e3b3f9c28..e49445b6b 100644 --- a/profiles/default/linux/amd64/parent +++ b/profiles/default/linux/amd64/parent @@ -1,2 +1,2 @@ -../ -../../../arch/amd64 +.. +sage-on-gentoo:arch/amd64 diff --git a/profiles/default/linux/parent b/profiles/default/linux/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/default/linux/parent +++ b/profiles/default/linux/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/default/linux/x86/13.0/devel/parent b/profiles/default/linux/x86/13.0/devel/parent index 7cb4764a0..bbb6d7897 100644 --- a/profiles/default/linux/x86/13.0/devel/parent +++ b/profiles/default/linux/x86/13.0/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../../targets/devel +.. +sage-on-gentoo:targets/devel diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent index f49cf11b1..f1f056c2f 100644 --- a/profiles/default/linux/x86/13.0/parent +++ b/profiles/default/linux/x86/13.0/parent @@ -1,2 +1,2 @@ gentoo:default/linux/amd64/13.0 -../ +.. diff --git a/profiles/default/linux/x86/13.0/stable/bindoc/parent b/profiles/default/linux/x86/13.0/stable/bindoc/parent index 5c37a31e0..bc5747dda 100644 --- a/profiles/default/linux/x86/13.0/stable/bindoc/parent +++ b/profiles/default/linux/x86/13.0/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/default/linux/x86/13.0/stable/parent b/profiles/default/linux/x86/13.0/stable/parent index 9f7330b42..5a30aad9e 100644 --- a/profiles/default/linux/x86/13.0/stable/parent +++ b/profiles/default/linux/x86/13.0/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../../targets/stable +.. +sage-on-gentoo:targets/stable diff --git a/profiles/default/linux/x86/parent b/profiles/default/linux/x86/parent index 80e3640ef..2600c5b96 100644 --- a/profiles/default/linux/x86/parent +++ b/profiles/default/linux/x86/parent @@ -1,2 +1 @@ -../ -../../../arch/x86 +sage-on-gentoo:arch/x86 diff --git a/profiles/default/parent b/profiles/default/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/default/parent +++ b/profiles/default/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/prefix/linux-standalone/amd64/devel/parent b/profiles/prefix/linux-standalone/amd64/devel/parent index b29a8daf0..e121b94a1 100644 --- a/profiles/prefix/linux-standalone/amd64/devel/parent +++ b/profiles/prefix/linux-standalone/amd64/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/devel +.. +sage-on-gentoo:releases/devel diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent index 6594684d1..e54fd690e 100644 --- a/profiles/prefix/linux-standalone/amd64/parent +++ b/profiles/prefix/linux-standalone/amd64/parent @@ -1,3 +1,3 @@ -gentoo:prefix/linux-standalone/x86 -../ -../../../arch/amd64 +gentoo:prefix/linux-standalone/amd64 +.. +sage-on-gentoo:arch/amd64 diff --git a/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent index 5ced07da2..bc5747dda 100644 --- a/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent +++ b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/prefix/linux-standalone/amd64/stable/parent b/profiles/prefix/linux-standalone/amd64/stable/parent index ed4d3b86e..99840371f 100644 --- a/profiles/prefix/linux-standalone/amd64/stable/parent +++ b/profiles/prefix/linux-standalone/amd64/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/stable +.. +sage-on-gentoo:releases/stable diff --git a/profiles/prefix/linux-standalone/parent b/profiles/prefix/linux-standalone/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/prefix/linux-standalone/parent +++ b/profiles/prefix/linux-standalone/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/prefix/linux-standalone/x86/devel/parent b/profiles/prefix/linux-standalone/x86/devel/parent index b29a8daf0..e121b94a1 100644 --- a/profiles/prefix/linux-standalone/x86/devel/parent +++ b/profiles/prefix/linux-standalone/x86/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/devel +.. +sage-on-gentoo:releases/devel diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent index 6594684d1..de5fbd6f9 100644 --- a/profiles/prefix/linux-standalone/x86/parent +++ b/profiles/prefix/linux-standalone/x86/parent @@ -1,3 +1,3 @@ gentoo:prefix/linux-standalone/x86 -../ -../../../arch/amd64 +.. +sage-on-gentoo:arch/x86 diff --git a/profiles/prefix/linux-standalone/x86/stable/bindoc/parent b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent index 5ced07da2..bc5747dda 100644 --- a/profiles/prefix/linux-standalone/x86/stable/bindoc/parent +++ b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/prefix/linux-standalone/x86/stable/parent b/profiles/prefix/linux-standalone/x86/stable/parent index ed4d3b86e..99840371f 100644 --- a/profiles/prefix/linux-standalone/x86/stable/parent +++ b/profiles/prefix/linux-standalone/x86/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/stable +.. +sage-on-gentoo:releases/stable diff --git a/profiles/prefix/linux/amd64/devel/parent b/profiles/prefix/linux/amd64/devel/parent index b29a8daf0..e121b94a1 100644 --- a/profiles/prefix/linux/amd64/devel/parent +++ b/profiles/prefix/linux/amd64/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/devel +.. +sage-on-gentoo:releases/devel diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent index 02055a081..d2b05d5f0 100644 --- a/profiles/prefix/linux/amd64/parent +++ b/profiles/prefix/linux/amd64/parent @@ -1,3 +1,3 @@ gentoo:prefix/linux/amd64 -../ -../../../arch/amd64 +.. +sage-on-gentoo:arch/amd64 diff --git a/profiles/prefix/linux/amd64/stable/bindoc/parent b/profiles/prefix/linux/amd64/stable/bindoc/parent index 5ced07da2..bc5747dda 100644 --- a/profiles/prefix/linux/amd64/stable/bindoc/parent +++ b/profiles/prefix/linux/amd64/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/prefix/linux/amd64/stable/parent b/profiles/prefix/linux/amd64/stable/parent index ed4d3b86e..99840371f 100644 --- a/profiles/prefix/linux/amd64/stable/parent +++ b/profiles/prefix/linux/amd64/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/stable +.. +sage-on-gentoo:releases/stable diff --git a/profiles/prefix/linux/parent b/profiles/prefix/linux/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/prefix/linux/parent +++ b/profiles/prefix/linux/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/prefix/linux/x86/devel/parent b/profiles/prefix/linux/x86/devel/parent index b29a8daf0..e121b94a1 100644 --- a/profiles/prefix/linux/x86/devel/parent +++ b/profiles/prefix/linux/x86/devel/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/devel +.. +sage-on-gentoo:releases/devel diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent index 21a83f841..1cd2f484a 100644 --- a/profiles/prefix/linux/x86/parent +++ b/profiles/prefix/linux/x86/parent @@ -1,3 +1,3 @@ -prefix/linux/x86 -../ -../../../arch/x86 +gentoo:prefix/linux/x86 +.. +sage-on-gentoo:arch/x86 diff --git a/profiles/prefix/linux/x86/stable/bindoc/parent b/profiles/prefix/linux/x86/stable/bindoc/parent index 5ced07da2..bc5747dda 100644 --- a/profiles/prefix/linux/x86/stable/bindoc/parent +++ b/profiles/prefix/linux/x86/stable/bindoc/parent @@ -1,2 +1,2 @@ -../ -../../../../../features/bindoc +.. +sage-on-gentoo:features/bindoc diff --git a/profiles/prefix/linux/x86/stable/parent b/profiles/prefix/linux/x86/stable/parent index ed4d3b86e..99840371f 100644 --- a/profiles/prefix/linux/x86/stable/parent +++ b/profiles/prefix/linux/x86/stable/parent @@ -1,2 +1,2 @@ -../ -../../../../releases/stable +.. +sage-on-gentoo:releases/stable diff --git a/profiles/prefix/parent b/profiles/prefix/parent index eb4d9056a..f3229c5b9 100644 --- a/profiles/prefix/parent +++ b/profiles/prefix/parent @@ -1 +1 @@ -../ +.. diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors index 8bafd5b75..4ab5ad78c 100644 --- a/profiles/thirdpartymirrors +++ b/profiles/thirdpartymirrors @@ -1,2 +1,2 @@ -sageupstream http://files.sagemath.org//spkg/upstream/ http://ftp.riken.jp/sagemath/spkg/upstream/ http://echidna.maths.usyd.edu.au/sage/spkg/upstream http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/upstream -sagemath http://sagetrac.lipn.univ-paris13.fr/sage/ +sageupstream http:/files.sagemath.org//spkg/upstream/ http:/ftp.riken.jp/sagemath/spkg/upstream/ http:/echidna.maths.usyd.edu.au/sage/spkg/upstream http:/www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream ftp:/ftp.fu-berlin.de/unix/misc/sage/spkg/upstream +sagemath http:/sagetrac.lipn.univ-paris13.fr/sage/ From 192645663e4d62de8ecc50114a5ff64ea37282e9 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Thu, 1 Jun 2017 16:52:21 +0200 Subject: [PATCH 20/25] corrected reference to the wrong folder Changes to be committed: modified: profiles/default/linux/amd64/13.0/devel/parent modified: profiles/default/linux/amd64/13.0/stable/parent modified: profiles/default/linux/x86/13.0/devel/parent modified: profiles/default/linux/x86/13.0/stable/parent --- profiles/default/linux/amd64/13.0/devel/parent | 2 +- profiles/default/linux/amd64/13.0/stable/parent | 2 +- profiles/default/linux/x86/13.0/devel/parent | 2 +- profiles/default/linux/x86/13.0/stable/parent | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/default/linux/amd64/13.0/devel/parent b/profiles/default/linux/amd64/13.0/devel/parent index bbb6d7897..e121b94a1 100644 --- a/profiles/default/linux/amd64/13.0/devel/parent +++ b/profiles/default/linux/amd64/13.0/devel/parent @@ -1,2 +1,2 @@ .. -sage-on-gentoo:targets/devel +sage-on-gentoo:releases/devel diff --git a/profiles/default/linux/amd64/13.0/stable/parent b/profiles/default/linux/amd64/13.0/stable/parent index 5a30aad9e..99840371f 100644 --- a/profiles/default/linux/amd64/13.0/stable/parent +++ b/profiles/default/linux/amd64/13.0/stable/parent @@ -1,2 +1,2 @@ .. -sage-on-gentoo:targets/stable +sage-on-gentoo:releases/stable diff --git a/profiles/default/linux/x86/13.0/devel/parent b/profiles/default/linux/x86/13.0/devel/parent index bbb6d7897..e121b94a1 100644 --- a/profiles/default/linux/x86/13.0/devel/parent +++ b/profiles/default/linux/x86/13.0/devel/parent @@ -1,2 +1,2 @@ .. -sage-on-gentoo:targets/devel +sage-on-gentoo:releases/devel diff --git a/profiles/default/linux/x86/13.0/stable/parent b/profiles/default/linux/x86/13.0/stable/parent index 5a30aad9e..99840371f 100644 --- a/profiles/default/linux/x86/13.0/stable/parent +++ b/profiles/default/linux/x86/13.0/stable/parent @@ -1,2 +1,2 @@ .. -sage-on-gentoo:targets/stable +sage-on-gentoo:releases/stable From 6eaf684efea6f617537c590d815645c5de674a3c Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Fri, 2 Jun 2017 22:40:53 +0200 Subject: [PATCH 21/25] profile part 3 + fixes Changes to be committed: modified: metadata/layout.conf new file: profiles/arch.list modified: profiles/default/linux/x86/13.0/parent new file: profiles/eapi new file: profiles/features/bindoc/eapi new file: profiles/prefix/eapi new file: profiles/releases/devel/eapi new file: profiles/releases/stable/eapi --- metadata/layout.conf | 2 ++ profiles/arch.list | 5 +++++ profiles/default/linux/x86/13.0/parent | 2 +- profiles/eapi | 1 + profiles/features/bindoc/eapi | 1 + profiles/prefix/eapi | 1 + profiles/releases/devel/eapi | 1 + profiles/releases/stable/eapi | 1 + 8 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 profiles/arch.list create mode 100644 profiles/eapi create mode 100644 profiles/features/bindoc/eapi create mode 100644 profiles/prefix/eapi create mode 100644 profiles/releases/devel/eapi create mode 100644 profiles/releases/stable/eapi diff --git a/metadata/layout.conf b/metadata/layout.conf index f1f9325df..0ccdb0c37 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -20,3 +20,5 @@ thin-manifests = true update-changelog = false use-manifests = strict + +profile-formats = portage-2 diff --git a/profiles/arch.list b/profiles/arch.list new file mode 100644 index 000000000..a529ca6ad --- /dev/null +++ b/profiles/arch.list @@ -0,0 +1,5 @@ +amd64 +x86 +amd64-linux +x86-linux + diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent index f1f056c2f..fd0a0a46c 100644 --- a/profiles/default/linux/x86/13.0/parent +++ b/profiles/default/linux/x86/13.0/parent @@ -1,2 +1,2 @@ -gentoo:default/linux/amd64/13.0 +gentoo:default/linux/x86/13.0 .. diff --git a/profiles/eapi b/profiles/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/features/bindoc/eapi b/profiles/features/bindoc/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/features/bindoc/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/prefix/eapi b/profiles/prefix/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/prefix/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/releases/devel/eapi b/profiles/releases/devel/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/releases/devel/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/releases/stable/eapi b/profiles/releases/stable/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/releases/stable/eapi @@ -0,0 +1 @@ +5 From 0d0ca9e1408bdbe61baa8e2f8e5891c846264b3a Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Fri, 2 Jun 2017 23:00:41 +0200 Subject: [PATCH 22/25] removed ::sage-on-gentoo from keywords Changes to be committed: modified: profiles/releases/devel/package.keywords modified: profiles/releases/stable/package.keywords --- profiles/releases/devel/package.keywords | 7 +++---- profiles/releases/stable/package.keywords | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/profiles/releases/devel/package.keywords b/profiles/releases/devel/package.keywords index 272b4f38e..866363c60 100644 --- a/profiles/releases/devel/package.keywords +++ b/profiles/releases/devel/package.keywords @@ -8,11 +8,11 @@ dev-java/asm:2 >=dev-libs/ntl-9.8.1 ~dev-libs/ppl-1.1 dev-libs/c-blosc ->=dev-lisp/ecls-16.0.0::sage-on-gentoo +>=dev-lisp/ecls-16.0.0 dev-python/characteristic dev-python/cvxopt =dev-python/cysignals-1.6* -~dev-python/cython-0.25.2::sage-on-gentoo +~dev-python/cython-0.25.2 ~dev-python/bottleneck-0.8.0 >=dev-python/matplotlib-1.5.1 ~dev-python/networkx-1.11 @@ -113,7 +113,7 @@ dev-gap/GAPDoc >=sci-mathematics/glpk-4.54 >=sci-mathematics/lcalc-1.23-r6 sci-mathematics/lrcalc -~sci-mathematics/maxima-5.39.0::sage-on-gentoo +~sci-mathematics/maxima-5.39.0 sci-mathematics/mcube sci-mathematics/optimal sci-mathematics/palp @@ -186,4 +186,3 @@ dev-libs/igraph ~dev-gap/cryst-4.1.12 ~dev-gap/toric-1.8 ~dev-gap/sage-meta-1.0 - diff --git a/profiles/releases/stable/package.keywords b/profiles/releases/stable/package.keywords index 6afc64f95..69f2be96b 100644 --- a/profiles/releases/stable/package.keywords +++ b/profiles/releases/stable/package.keywords @@ -8,11 +8,11 @@ dev-java/asm:2 >=dev-libs/ntl-9.8.1 ~dev-libs/ppl-1.1 dev-libs/c-blosc ->=dev-lisp/ecls-16.0.0::sage-on-gentoo +>=dev-lisp/ecls-16.0.0 dev-python/characteristic dev-python/cvxopt ~dev-python/cysignals-1.4.0 -~dev-python/cython-0.25.2::sage-on-gentoo +~dev-python/cython-0.25.2 ~dev-python/bottleneck-0.8.0 >=dev-python/matplotlib-1.5.1 ~dev-python/networkx-1.10 @@ -32,7 +32,7 @@ dev-python/flask-oldsessions =dev-python/setuptools-20* dev-python/terminado dev-python/mistune -=dev-python/numpy-1.10*::sage-on-gentoo +=dev-python/numpy-1.10* dev-python/cycler dev-python/versioneer =dev-python/jedi-0.10* @@ -113,7 +113,7 @@ dev-gap/GAPDoc >=sci-mathematics/glpk-4.54 >=sci-mathematics/lcalc-1.23-r6 sci-mathematics/lrcalc -~sci-mathematics/maxima-5.39.0::sage-on-gentoo +~sci-mathematics/maxima-5.39.0 sci-mathematics/mcube sci-mathematics/optimal sci-mathematics/palp @@ -185,4 +185,3 @@ dev-libs/igraph ~dev-gap/cryst-4.1.12 ~dev-gap/toric-1.8 ~dev-gap/sage-meta-1.0 - From 45eeab6709f318e2f4839bbf5040fdc3debcc573 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Fri, 2 Jun 2017 23:08:06 +0200 Subject: [PATCH 23/25] fixes Changes to be committed: modified: profiles/arch.list modified: profiles/profiles.desc modified: profiles/thirdpartymirrors --- profiles/arch.list | 1 - profiles/profiles.desc | 20 ++++++++++---------- profiles/thirdpartymirrors | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/profiles/arch.list b/profiles/arch.list index a529ca6ad..fb5b33a08 100644 --- a/profiles/arch.list +++ b/profiles/arch.list @@ -2,4 +2,3 @@ amd64 x86 amd64-linux x86-linux - diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 70172898f..34c5399b0 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -1,18 +1,18 @@ -amd64 default/linux/amd64/13.0/stable stable -amd64 default/linux/amd64/13.0/stable/bindoc stable -amd64 default/linux/amd64/13.0/devel dev -x86 default/linux/x86/13.0/stable stable -x86 default/linux/x86/13.0/stable/bindoc stable -x86 default/linux/x86/13.0/devel dev +amd64 default/linux/amd64/13.0/stable stable +amd64 default/linux/amd64/13.0/stable/bindoc stable +amd64 default/linux/amd64/13.0/devel dev +x86 default/linux/x86/13.0/stable stable +x86 default/linux/x86/13.0/stable/bindoc stable +x86 default/linux/x86/13.0/devel dev amd64-linux prefix/linux/amd64/stable exp amd64-linux prefix/linux/amd64/stable/bindoc exp -amd64-linux prefix/linux/amd64/devel exp +amd64-linux prefix/linux/amd64/devel exp x86-linux prefix/linux/x86/stable exp x86-linux prefix/linux/x86/stable/bindoc exp -x86-linux prefix/linux/x86/devel exp +x86-linux prefix/linux/x86/devel exp amd64-linux prefix/linux-standalone/amd64/stable exp amd64-linux prefix/linux-standalone/amd64/stable/bindoc exp -amd64-linux prefix/linux-standalone/amd64/devel exp +amd64-linux prefix/linux-standalone/amd64/devel exp x86-linux prefix/linux-standalone/x86/stable exp x86-linux prefix/linux-standalone/x86/stable/bindoc exp -x86-linux prefix/linux-standalone/x86/devel exp +x86-linux prefix/linux-standalone/x86/devel exp diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors index 4ab5ad78c..8bafd5b75 100644 --- a/profiles/thirdpartymirrors +++ b/profiles/thirdpartymirrors @@ -1,2 +1,2 @@ -sageupstream http:/files.sagemath.org//spkg/upstream/ http:/ftp.riken.jp/sagemath/spkg/upstream/ http:/echidna.maths.usyd.edu.au/sage/spkg/upstream http:/www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream ftp:/ftp.fu-berlin.de/unix/misc/sage/spkg/upstream -sagemath http:/sagetrac.lipn.univ-paris13.fr/sage/ +sageupstream http://files.sagemath.org//spkg/upstream/ http://ftp.riken.jp/sagemath/spkg/upstream/ http://echidna.maths.usyd.edu.au/sage/spkg/upstream http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/upstream +sagemath http://sagetrac.lipn.univ-paris13.fr/sage/ From b46d8d48342f5195eb8f0dd953635959c783a7fa Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Wed, 7 Jun 2017 03:40:22 +0200 Subject: [PATCH 24/25] updated readme Changes to be committed: modified: README.rst --- README.rst | 120 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 49 deletions(-) diff --git a/README.rst b/README.rst index 2d5fc5932..f425c031a 100644 --- a/README.rst +++ b/README.rst @@ -48,55 +48,77 @@ QUICK INSTALLATION GUIDE might want to try skipping to step 5 first, and if it doesn't work, coming back and doing steps 3 and 4. -3. *UNMASK EBUILDS*: - Before being able to install you may need to unmask the required ebuilds. If - you are using Gentoo/unstable or Funtoo (i.e. you have a line like - ``ACCEPT_KEYWORDS=~arch`` in your /etc/portage/make.conf) you can at least - skip the ``keywords`` entries, but the ``unmask`` entries may still be - relevant. You can make use of the following files, which already contain all - required entries:: - - sage-on-gentoo/package.unmask/sage - sage-on-gentoo/package.keywords/sage - sage-on-gentoo/package.keywords/sage.prefix (for prefix users only) - - To use these files permanently, place symbolic links to those files into your - ``/etc/portage/package.unmask`` and ``/etc/portage/package.keywords/`` - directories, respectively:: - - ln -s /sage-on-gentoo/package.unmask/sage \ - /etc/portage/package.unmask/sage - ln -s /sage-on-gentoo/package.keywords/sage \ - /etc/portage/package.keywords/sage - - Otherwise, simply copy them into the respective directories for a one-time - fix. - - The sage.prefix files contains keywords for ebuilds lacking any prefix - keywords. - -4. *ADD USE-FLAGS FOR EBUILDS*: - Since Sage's ebuild requires its dependencies to be built with several USE- - flags we provide a standard package.use file as well:: - - ln -s /sage-on-gentoo/package.use/sage \ - /etc/portage/package.use/sage - - If you are using unstable or Funtoo you may also need the following file:: - - ln -s /sage-on-gentoo/package.use/sage-unstable \ - /etc/portage/package.use/sage-unstable - - is usually /var/lib/layman (this path used to be - /usr/local/portage/layman for older version of layman). - - You should also consider linking in the same way the file ``99sage-doc-bin``. - This file sets sane default options for installing html documentation from a binary - tarball. Building the sage documentation from scratch is memory hungry and you - shouldn't consider doing it with less than 6GB of free memory on your system. - This is only available for stable realease of sage (sage-X.Y). User of the development - version of sage (sage-9999 ebuild) need to build their own documentation from scratch - if they need it. +3. *USE THE PROFILE*: + This overlay provides three types of profiles:: + + stable + stable/bindoc + devel + + you can see them with the command:: + + eselect profile list + + the fastest method for using the profile chosen is via:: + + eselect profile set + + where is the number of the profile you want to use. + + Alternatively, if you don't want to lose your profile, you can combine your + existing profile with one of the sage-on-gentoo overlay; you may want to + get a look to this link + + https://wiki.gentoo.org/wiki/Profile_(Portage)#Combining_profiles + + or follow our quickguide. + To get started you need a local overlay, for example in:: + + /usr/local/portage + + next you have to put this line:: + + profile-formats = portage-2 + + in the file:: + + /usr/local/portage/metadata/layout.conf + + then you have to create the path for your local profile, for example combining + hardened-amd64 with stable-bindoc-amd64:: + + mkdir -p /usr/local/portage/profiles/hardened/linux/amd64/sage-stable-bindoc/ + + once created, you put the lines corresponding to the path of the profiles (found + with eselect profile list) + + sage-on-gentoo:default/linux/amd64/13.0/stable/bindoc + gentoo:hardened/linux/amd64 + + in:: + + /usr/local/portage/profiles/hardened/linux/amd64/sage-stable-bindoc/parent + + remember that the order matters. + Lastly you have to add a line corresponding to the path you have created + following this format:: + + amd64 hardened/linux/amd64/sage-stable-bindoc stable + + to the file:: + + /usr/local/portage/profiles/profiles.desc + + remember to change "stable" into "dev" if you use the "devel" profile or into + "exp" if you use any of the prefix profiles and "amd64" to your architecture. + + The new profile will show if you run:: + + eselect profile list + + and now you can choose it with:: + + eselect profile set 5. *INSTALL SAGE*: Type:: From 4adba11b5b66c87fd6904578b08ba4bde8e32523 Mon Sep 17 00:00:00 2001 From: Alessandro-Barbieri Date: Mon, 12 Jun 2017 19:03:09 +0200 Subject: [PATCH 25/25] updated devel package.keywords Changes to be committed: modified: profiles/releases/devel/package.keywords --- profiles/releases/devel/package.keywords | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/releases/devel/package.keywords b/profiles/releases/devel/package.keywords index 866363c60..ef6f5b1fe 100644 --- a/profiles/releases/devel/package.keywords +++ b/profiles/releases/devel/package.keywords @@ -120,8 +120,8 @@ sci-mathematics/palp ~sci-mathematics/pari-2.9.2 sci-mathematics/pari-data ~sci-mathematics/planarity-3.0.0.5 -=sci-libs/libbrial-1.0* -=dev-python/pybrial-1.0* +=sci-libs/brial-1.0* +=dev-python/sage-brial-1.0* ~sci-mathematics/nauty-2.6.1 sci-mathematics/ratpoints sci-mathematics/rubiks