gentoo-layman/Dockerfile.template: Update for modern layman

From [1]:

  This method uses the new portage plugins system.  Layman will create
  its configuration file in /etc/portage/repos.conf/ directory.  There
  is no need for PORTDIR_OVERLAY changes in /etc/portage/make.conf.

  Configure layman to use repos.conf method in /etc/layman/layman.cfg.
  New installations of layman will probably have this already set
  correctly:

  ...

  If you have >=layman-2.3.0 installed, you can force a rebuild of
  layman's repos.conf files:

    root # layman-updater -R

although I've gone with the long option --rebuild for clarity in this
commit.

Update the fetch command because:

  $ layman --version
  2.4.1
  $ layman --help | grep -A2 -- --fetch
    -f, --fetch   Fetch a remote list of overlays. This option is
                  deprecated. The fetch operation will be performed by
                  default when you run sync, sync-all, or list.

[1]: https://wiki.gentoo.org/wiki/Layman#repos.conf_method_.28default.29

diff --git a/gentoo-layman/Dockerfile.template b/gentoo-layman/Dockerfile.template
index 48a623a40e20c1f058a4f29c3c0e1a3b56120b0a..427ef39455f90adf3e67970335faff38bb43f004 100644 (file)
--- a/gentoo-layman/Dockerfile.template
+++ b/gentoo-layman/Dockerfile.template
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 W. Trevor King <wking@tremily.us>
+# Copyright (C) 2013-2016 W. Trevor King <wking@tremily.us>

 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:


@@ -37,6 +37,6 @@ RUN echo 'dev-python/ssl-fetch ~amd64' >> /etc/portage/package.accept_keywords/l
 
 RUN emerge -v layman
 RUN eselect news read new
 
 RUN emerge -v layman
 RUN eselect news read new

-RUN echo 'source /var/lib/layman/make.conf' >> /etc/portage/make.conf
+RUN layman-updater --rebuild

 RUN sed -i 's/^check_official.*/check_official : no/' /etc/layman/layman.cfg
 RUN sed -i 's/^check_official.*/check_official : no/' /etc/layman/layman.cfg

-RUN layman --fetch
+RUN layman --sync-all