From 5b98494124e026ffb987272537f325bca6db13f2 Mon Sep 17 00:00:00 2001
From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@gentoo.org>
Date: Sun, 28 Apr 2013 22:36:56 +0000
Subject: [PATCH] Drop the date from the destination dir to avoid the double
 date directories in the mirrors.

---
 tools/catalyst-auto-amd64.conf | 12 ++++++------
 tools/catalyst-auto-x86.conf   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a162f15e..9215228a 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -58,20 +58,20 @@ pre_build() {
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
 	if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
-		mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}
-		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+		mkdir -p ${BUILD_DESTDIR_BASE}
+		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
 		if [ -f *${DATESTAMP}*.iso ]; then
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
 		fi
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
 	if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
-		mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
-		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+		mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened
 		if [ -f *${DATESTAMP}*.iso ]; then
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
 		fi
 	fi
 }
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index e45b0db2..45a97ad8 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -50,20 +50,20 @@ pre_build() {
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
 	if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
-		mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}
-		cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+		mkdir -p ${BUILD_DESTDIR_BASE}
+		cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
 		if [ -f *${DATESTAMP}*.iso ]; then
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
 		fi
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
 	if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
-		mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
-		cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+		mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+		cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened
 		if [ -f *${DATESTAMP}*.iso ]; then
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
 		fi
 	fi
 }