solving merge conflicts

Dockerfile

@@ -1,16 +1,14 @@
 FROM sabayon/gentoo-stage3-base-amd64
 
-
 MAINTAINER mudler <mudler@sabayonlinux.org>
 
 # Set locales to en_US.UTF-8
 RUN echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen &&  locale-gen &&  eselect locale set en_US.utf8 && env-update && source /etc/profile
 ENV LC_ALL=en_US.UTF-8
 
-# Upgrading portage and installing necessary packages
-RUN rm -rf '/usr/portage/metadata/timestamp.chk' && \
-	 emerge --sync --quiet && \
-	layman -S && layman -a sabayon
+<<<<<<< HEAD
+# Upgrading portage
+RUN emerge --sync --quiet && layman -S && layman -a sabayon
 
 # Configure the sabayon box, installing equo setting up locales
 ADD ./script/sabayon-configuration.sh /
@@ -32,6 +30,12 @@ RUN /bin/bash /sabayon-configuration-build.sh && rm -rf /sabayon-configuration-b
 # Perform before-upgrade tasks (mirror sorting, updating repository db, removing portage and keeping profiles and metadata)
 RUN mv /etc/entropy/repositories.conf.d/entropy_sabayonlinux.org.example /etc/entropy/repositories.conf.d/entropy_sabayonlinux.org && equo up && equo repo mirrorsort sabayonlinux.org && cd /usr/portage/;ls | grep -v 'profiles' | grep -v 'metadata' | xargs rm -rf
 
+# Accepting licenses needed to continue automatic upgrade
+RUN rsync -a "rsync://rsync.at.gentoo.org/gentoo-portage/licenses/" "/usr/portage/licenses/" && \
+	ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept && \
+	equo u && \
+	echo -5 | equo conf update 
+
 # Cleanup and applying configs
 ADD ./script/post-update.sh /post-update.sh
 RUN /bin/bash /post-update.sh && rm -rf /post-update.sh

ext/base-licenses

@@ -0,0 +1,23 @@
+AGPL-3
+CC-BY-SA-3.0
+CC0-1.0
+GPL-1+
+HPND
+IJG
+MPL-2.0
+Old-MIT
+PCRE
+RSA
+Ruby-BSD
+SMAIL
+TermReadKey
+UoI-NCSA
+inner-net
+libmng
+libpng
+libtiff
+rc
+tcltk
+man-pages
+man-pages-posix-2013
+docbook