diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-03-17 05:11:21 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-03-17 05:11:21 +0000 |
| commit | cbde63b7af631acd4b0e39d2e75d0875cf17199a (patch) | |
| tree | 9a22777157179a03f445d69ac3527bd647b5c043 /app-arch | |
| parent | Clean up ;) (diff) | |
| download | historical-cbde63b7af631acd4b0e39d2e75d0875cf17199a.tar.gz historical-cbde63b7af631acd4b0e39d2e75d0875cf17199a.tar.bz2 historical-cbde63b7af631acd4b0e39d2e75d0875cf17199a.zip | |
tighten DEPEND (bug #44817); sed in src_unpack, not src_compile; use emake
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/unzip/ChangeLog | 5 | ||||
| -rw-r--r-- | app-arch/unzip/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/unzip/unzip-5.50-r2.ebuild | 20 |
3 files changed, 18 insertions, 11 deletions
diff --git a/app-arch/unzip/ChangeLog b/app-arch/unzip/ChangeLog index 90a170352f41..35182e1eb331 100644 --- a/app-arch/unzip/ChangeLog +++ b/app-arch/unzip/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-arch/unzip # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.20 2004/03/17 05:02:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.21 2004/03/17 05:11:21 mr_bones_ Exp $ + + 16 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> unzip-5.50-r2.ebuild: + tighten DEPEND (bug #44817); sed in src_unpack, not src_compile; use emake 16 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> unzip-5.42-r1.ebuild, unzip-5.50-r1.ebuild, unzip-5.50.ebuild: diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index c0a22d90bce7..480578dcf4e0 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,4 +1,4 @@ -MD5 50669e8801e7dd10d9ee42f7d43e4b2a ChangeLog 2572 -MD5 6c1cf8be868ea387690cb8cbd9ed80a9 unzip-5.50-r2.ebuild 1042 +MD5 f0211208a914c2876b2c0600c1e54f10 ChangeLog 2727 +MD5 c795e15fc50483381128eec78456edca unzip-5.50-r2.ebuild 1149 MD5 583a5d8bbc70fb1d858c5e40d686e8ce files/digest-unzip-5.50-r2 61 MD5 3b01796cbe10d9492bd8c0825bc83544 files/unzip-5.50-dotdot.patch 3236 diff --git a/app-arch/unzip/unzip-5.50-r2.ebuild b/app-arch/unzip/unzip-5.50-r2.ebuild index 3a665a5fef8f..9eaab9293f62 100644 --- a/app-arch/unzip/unzip-5.50-r2.ebuild +++ b/app-arch/unzip/unzip-5.50-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.50-r2.ebuild,v 1.8 2004/03/14 19:28:42 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.50-r2.ebuild,v 1.9 2004/03/17 05:11:21 mr_bones_ Exp $ inherit eutils @@ -12,29 +12,33 @@ LICENSE="Info-ZIP" SLOT="0" KEYWORDS="x86 ppc alpha hppa mips amd64 ia64 sparc ppc64" -DEPEND="virtual/glibc +RDEPEND="virtual/glibc" +DEPEND="${RDEPEND} >=sys-apps/sed-4" src_unpack() { unpack ${A} ; cd ${S} epatch ${FILESDIR}/${P}-dotdot.patch -} -src_compile() { - sed -i -e "s:-O3:${CFLAGS}:" \ + sed -i \ + -e "s:-O3:${CFLAGS}:" \ -e "s:CC=gcc LD=gcc:CC=${CC:-gcc} LD=${CC:-gcc}:" \ - -e "s:-O :${CFLAGS} :" unix/Makefile + -e "s:-O :${CFLAGS} :" unix/Makefile \ + || die "sed unix/Makefile failed" +} + +src_compile() { use x86 \ && TARGET=linux \ || TARGET=linux_noasm - make -f unix/Makefile ${TARGET} || die + emake -f unix/Makefile ${TARGET} || die "emake failed" } src_install() { - dobin unzip funzip unzipsfx unix/zipgrep + dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed" dosym /usr/bin/unzip /usr/bin/zipinfo doman man/*.1 dodoc BUGS COPYING.OLD History* LICENSE README ToDo WHERE |