From b5a73402319d843be6434e07bf353859f1bd5c76 Mon Sep 17 00:00:00 2001
From: Alexis Lahouze <alexis@lahouze.org>
Date: Mon, 26 Nov 2018 21:32:26 +0100
Subject: [PATCH] Fix package xtractions.

---
 Dockerfile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 703da65..fac2dc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR snakeoil
 RUN python -m setup bdist
 
 WORKDIR /
-RUN tar xvzf snakeoil/dist/snakeoil-*.tar.gz --transform 's/usr\/local/usr/'
+RUN tar xvzf snakeoil/dist/snakeoil-*.tar.gz
 
 # Build and install pyDeComp
 RUN git clone https://github.com/dol-sen/pyDeComp pydecomp
@@ -21,7 +21,7 @@ WORKDIR pydecomp
 RUN python -m setup bdist
 
 WORKDIR /
-RUN tar xvzf pydecomp/dist/pyDeComp-*.tar.gz --transform 's/usr\/local/usr/'
+RUN tar xvzf pydecomp/dist/pyDeComp-*.tar.gz
 
 # Clone catalyst repository
 RUN git clone https://anongit.gentoo.org/git/proj/catalyst.git catalyst
@@ -53,17 +53,19 @@ RUN apt-get update \
 #RUN apk add coreutils
 
 COPY --from=base /snakeoil/dist/snakeoil-*.tar.gz ./
-RUN tar xvzf snakeoil-*.tar.gz --transform 's/usr\/local/usr/' \
+RUN tar xvzf snakeoil-*.tar.gz \
     && rm snakeoil-*.tar.gz
 
 COPY --from=base /pydecomp/dist/pyDeComp-*.tar.gz ./
-RUN tar xvzf pyDeComp-*.tar.gz --transform 's/usr\/local/usr/' \
+RUN tar xvzf pyDeComp-*.tar.gz \
     && rm pyDeComp-*.tar.gz
 
 COPY --from=base /catalyst/dist/catalyst-*.tar.gz ./
-RUN tar xvzf catalyst-*.tar.gz --transform 's/usr\/local/usr/' \
+RUN tar xvzf catalyst-*.tar.gz \
     && rm catalyst-*.tar.gz
 
+RUN ln -sf /usr/local/share/catalyst /usr/share/catalyst
+
 COPY --from=base /usr/local/bin/shash /usr/local/bin/shash
 
 # Override Stage3 preclean to add perl-cleaner invocation