From d7faa2dacfbf56b856aba5d53b02754647cc2bfa Mon Sep 17 00:00:00 2001 From: Achim Gottinger Date: Thu, 14 Sep 2000 00:01:54 +0000 Subject: Added support for zip compressed archives RPM Support works again --- sys-apps/portage/files/ebuild | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys-apps/portage/files/ebuild b/sys-apps/portage/files/ebuild index 8dcdf62a5bc3..3ad23171071b 100644 --- a/sys-apps/portage/files/ebuild +++ b/sys-apps/portage/files/ebuild @@ -82,6 +82,11 @@ gzunpack() tar xzf $1 } +pkunpack() + { + unzip $i + } + pmake() { make ${MAKEOPTS} MAKE="make ${MAKEOPTS}" $* @@ -279,6 +284,12 @@ unpack() { tbz2) bz2unpack ${DISTDIR}/${x} ;; + zip) + pkunpack ${DISTDIR}/${x} + ;; + ZIP) + pkunpack ${DISTDIR}/${x} + ;; *) echo "Archive format not recognized." exit @@ -1017,27 +1028,23 @@ dyn_unmerge() { dyn_spec() { + + tar czf /usr/src/redhat/SOURCES/${PF}.tar.gz ${O}/${PF}.ebuild ${O}/files - tar czf /usr/src/redhat/SOURCES/${P}.tar.gz ${P}.* files - - local V - - V=${P#${O##*/}*} - V=${V/[!digit]/} - V=${V/-/.} - - cat <<__END1__ > ${P}.spec + cat <<__END1__ > ${PF}.spec Summary: ${DESCRIPTION} -Name: ${O##*/} -Version: ${V} -Release: 1 +Name: ${PN} +Version: ${PV} +Release: ${PR} Copyright: GPL Group: portage/${CATEGORY} -Source: ${P}.tar.gz +Source: ${PF}.tar.gz Buildroot: ${D} %description ${DESCRIPTION} +${HOMEPAGE} + %prep %setup -c @@ -1054,16 +1061,9 @@ __END1__ } dyn_rpm () { dyn_spec - rpm -bb ${P}.spec - local V - - V=${P#${O##*/}*} - V=${V/[!digit]/} - V=${V/-/.} - local W - W="portage/${CATEGORY}" - - install -D /usr/src/redhat/RPMS/i386/${O##*/}-${V}-1.i386.rpm ${RPMDIR}/${W}/${O##*/}-${V}.rpm + rpm -bb ${PF}.spec + + install -D /usr/src/redhat/RPMS/i386/${PN}-${PV}-${PR}.i386.rpm ${RPMDIR}/${CATEGORY}/${PN}-${PV}-${PR}.rpm } dyn_help() { -- cgit v1.2.3-65-gdbad