From 798e902d8d3cd46edd104c4d1a8667621b300e7c Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 12 Aug 2016 17:53:13 -0700 Subject: [PATCH] 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 --- README.md | 4 ++-- thumbor/Dockerfile.template | 3 ++- thumbor/package.accept_keywords | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8aa6fd4..b4ef133 100644 --- 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) - | `-- 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) @@ -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) - |-- thumbor (adds Thumbor) `-- gentoo-java (adds IcedTea) `-- elasticsearch (adds Elasticsearch) diff --git a/thumbor/Dockerfile.template b/thumbor/Dockerfile.template index c9c4cb9..eeba5dc 100644 --- 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 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 diff --git a/thumbor/package.accept_keywords b/thumbor/package.accept_keywords index e9c38e5..5f9b120 100644 --- 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 -=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 -- 2.26.2