[gentoo-commits] proj/g-sorcery:master commit in: gs_ctan/data/

[Jauhien Piatlicki]

commit:     37fe9b31c6db581768b29cff033f9b1e8c611a33
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Wed Jul 31 23:09:32 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Wed Jul 31 23:09:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=37fe9b31

gs-ctan.eclass fixed, it does not write to distdir now

---
 gs_ctan/data/gs-ctan.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gs_ctan/data/gs-ctan.eclass b/gs_ctan/data/gs-ctan.eclass
index 3cf9269..b2124ed 100644
--- a/gs_ctan/data/gs-ctan.eclass
+++ b/gs_ctan/data/gs-ctan.eclass
@@ -46,15 +46,14 @@ else
 fi
 
 SUFFIX="${SOURCE_TYPE}"
+SOURCEFILE=${REALNAME}.${SUFFIX}
 
 gs-ctan_fetch() {
 	addwrite "${GSCTAN_STORE_DIR}"
 	pushd "${GSCTAN_STORE_DIR}" >/dev/null || die "can't chdir to ${GSCTAN_STORE_DIR}"
-	local SOURCEFILE=${REALNAME}.${SUFFIX}
 	if [[ ! -f "${SOURCEFILE}" ]]; then
 		$GSCTAN_FETCH_CMD ${BASE_SRC_URI}${CATALOGUE}${SOURCEFILE} || die
 	fi
-	cp  ${SOURCEFILE} ${DISTDIR}/${P}.${SUFFIX} || die
 	popd >/dev/null || die
 }
 
@@ -63,7 +62,8 @@ gs-ctan_src_unpack() {
 		if [[ x${DIGEST_SOURCES} = x ]]; then
 			gs-ctan_fetch
 		fi
-		unpack ${P}.${SUFFIX}
+		cp ${GSCTAN_STORE_DIR}/${SOURCEFILE} . || die
+		unzip ${SOURCEFILE} || die
 		mv ${PN} ${P} || die
 	else
 		if [[ x${DIGEST_SOURCES} = x ]]; then
@@ -71,7 +71,7 @@ gs-ctan_src_unpack() {
 		fi
 		mkdir ${S} || die
 		cd ${S} || die
-		unpack ${P}.${SUFFIX}
+		tar xvf ${GSCTAN_STORE_DIR}/${SOURCEFILE} || die
 		rm -rf tlpkg || die
 	fi
 }