Remove deprecated source of /var/lib/layman/make.conf. Now it is used…

… repos.conf mode
Sabayon · Nov 12, 2017 · 8e0004e · 8e0004e
1 parent f75d48e
commit 8e0004e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 10 deletions.
diff --git a/conf/armhfp/portage/make.conf b/conf/armhfp/portage/make.conf
@@ -45,6 +45,3 @@ RUBY_TARGETS="ruby21"
 
 #################################################
 ### END COMMON PART -- cut here
-
-source /var/lib/layman/make.conf
-
diff --git a/conf/armv6l/portage/make.conf b/conf/armv6l/portage/make.conf
@@ -39,5 +39,3 @@ USE_PYTHON="2.7"
 
 #################################################
 ### END COMMON PART -- cut here
-
-source /var/lib/layman/make.conf
diff --git a/conf/armv7l/portage/make.conf b/conf/armv7l/portage/make.conf
@@ -43,6 +43,3 @@ USE_PYTHON="2.7"
 
 #################################################
 ### END COMMON PART -- cut here
-
-source /var/lib/layman/make.conf
-
diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64
@@ -49,7 +49,6 @@ QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el
 
 ## PORTAGE CONFIG ##
 PORTDIR_OVERLAY="/usr/local/portage"
-source /var/lib/layman/make.conf
 CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d"
 # /lib/modules mask is useful for our internal tinderbox
 CONFIG_PROTECT_MASK="/etc/skel /lib/modules"

diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86
@@ -52,7 +52,6 @@ QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el
 
 ## PORTAGE CONFIG ##
 PORTDIR_OVERLAY="/usr/local/portage"
-source /var/lib/layman/make.conf
 CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d"
 # /lib/modules mask is useful for our internal tinderbox
 CONFIG_PROTECT_MASK="/etc/skel /lib/modules"