thumbor: Update to post v6.0

Catch package.accept_keywords up with dependency changes from the
current Gentoo tree and my recently-bumped dev-python/thumbor package.

Install the wtk overlay with some Layman hoop-jumping, since my
overlay has recently been bumped from the official list on account of
old EAPIs and such [1].  I'll work on getting it back up to speed, but
that's not going to happen today ;).

Also fix the location in the README tree (it should be under
gentoo-layman).

[1]: https://bugs.gentoo.org/show_bug.cgi?id=557812

diff --git a/README.md b/README.md
index 8aa6fd4c9f9c512986fa54e664e0f293149805c6..b4ef13360fd7c8d9c188045abad6677b0243b7fc 100644 (file)
--- a/README.md
+++ b/README.md
@@ -26,7 +26,8 @@ The dependency graph is:
                             |-- buildbot  (adds a Buildbot master and slave)
                             |-- docker-registry  (adds a Docker registry server)
                             |-- gentoo-layman  (adds layman for Gentoo overlays)
                             |-- buildbot  (adds a Buildbot master and slave)
                             |-- docker-registry  (adds a Docker registry server)
                             |-- gentoo-layman  (adds layman for Gentoo overlays)

-                            |   `-- package-cache  (adds a package-cache proxy)
+                            |   |-- package-cache  (adds a package-cache proxy)
+                            |   `-- thumbor  (adds Thumbor)

                             |-- gentoo-node  (adds Node and npm)
                             |   `-- hubot  (adds hubot with an IRC adapter)
                             |-- irker  (adds irker, and spawns irkerd by default)
                             |-- gentoo-node  (adds Node and npm)
                             |   `-- hubot  (adds hubot with an IRC adapter)
                             |-- irker  (adds irker, and spawns irkerd by default)


@@ -43,7 +44,6 @@ The dependency graph is:
                             |   |-- salt-master  (enables a Salt Stack master)
                             |   `-- salt-minion  (enables a Salt Stack minion)
                             |-- stunnel  (adds stunnel)
                             |   |-- salt-master  (enables a Salt Stack master)
                             |   `-- salt-minion  (enables a Salt Stack minion)
                             |-- stunnel  (adds stunnel)

-                            |-- thumbor  (adds Thumbor)

                             `-- gentoo-java  (adds IcedTea)
                                 `-- elasticsearch  (adds Elasticsearch)
 
                             `-- gentoo-java  (adds IcedTea)
                                 `-- elasticsearch  (adds Elasticsearch)
 

diff --git a/thumbor/Dockerfile.template b/thumbor/Dockerfile.template
index c9c4cb9e9316a2048cbdef0a09698acd4a59c27a..eeba5dc2717cb02180a76eddf48faff41c1efe81 100644 (file)
--- a/thumbor/Dockerfile.template
+++ b/thumbor/Dockerfile.template
@@ -34,7 +34,8 @@ RUN echo 'YES' | etc-update --automode -9
 RUN rm /etc/layman/._*
 RUN eselect python set $(eselect python show --python2)
 RUN echo 'USE="${USE} jpeg tiff truetype webp"' >> /etc/portage/make.conf
 RUN rm /etc/layman/._*
 RUN eselect python set $(eselect python show --python2)
 RUN echo 'USE="${USE} jpeg tiff truetype webp"' >> /etc/portage/make.conf

-RUN layman --add wtk
+RUN layman --overlays http://blog.tremily.us/posts/Gentoo_overlay/layman.xml --sync-all
+RUN layman --overlays http://blog.tremily.us/posts/Gentoo_overlay/layman.xml --add wtk

 COPY package.accept_keywords /etc/portage/package.accept_keywords/thumbor
 RUN emerge -v dev-python/thumbor
 RUN eselect news read new
 COPY package.accept_keywords /etc/portage/package.accept_keywords/thumbor
 RUN emerge -v dev-python/thumbor
 RUN eselect news read new

diff --git a/thumbor/package.accept_keywords b/thumbor/package.accept_keywords
index e9c38e59acfd29f7c06d496aabeafc690875d456..5f9b12033064659375d980bb5513aa3cb8eaed5c 100644 (file)
--- a/thumbor/package.accept_keywords
+++ b/thumbor/package.accept_keywords
@@ -4,7 +4,7 @@
 # required by dev-python/thumbor-9999::wtk
 # required by thumbor (argument)
 =dev-python/derpconf-9999 ~amd64
 # required by dev-python/thumbor-9999::wtk
 # required by thumbor (argument)
 =dev-python/derpconf-9999 ~amd64

-=dev-python/pillow-2.3.1 ~amd64
-=dev-python/python-magic-0.4.6-r1 ~amd64
-=dev-python/thumbor-pexif-0.14.1 ~amd64
-=media-libs/opencv-2.4.9 ~amd64
+=dev-python/libthumbor-9999 ~amd64
+=dev-python/pexif-0.15 ~amd64
+=dev-python/statsd-3.2.1 ~amd64
+=media-libs/opencv-3.1.0-r4 ~amd64