diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2003-06-24 20:34:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2003-06-24 20:34:20 +0000 |
| commit | 5f7a0ddaf4e7a18f76884e19147a14adec13fbad (patch) | |
| tree | c8dce04279ea92005b47914b4461afd2b8ff129e /sys-apps | |
| parent | touchups (diff) | |
| download | gentoo-2-5f7a0ddaf4e7a18f76884e19147a14adec13fbad.tar.gz gentoo-2-5f7a0ddaf4e7a18f76884e19147a14adec13fbad.tar.bz2 gentoo-2-5f7a0ddaf4e7a18f76884e19147a14adec13fbad.zip | |
fix inherit
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/e2fsprogs/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild | 26 | ||||
| -rw-r--r-- | sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild | 30 |
3 files changed, 23 insertions, 41 deletions
diff --git a/sys-apps/e2fsprogs/Manifest b/sys-apps/e2fsprogs/Manifest index ec3c8fa166fc..1413f60f54e1 100644 --- a/sys-apps/e2fsprogs/Manifest +++ b/sys-apps/e2fsprogs/Manifest @@ -1,7 +1,7 @@ -MD5 6254c9f6e16ecd87ffdeed82eb4c6f87 ChangeLog 3864 -MD5 91587ba650faaf9b24d096e86035da97 e2fsprogs-1.32-r2.ebuild 2409 -MD5 a6f6bcefda6ada3c967b91c9eb150090 e2fsprogs-1.33.ebuild 2564 -MD5 db361eb5cdf39ddae07e9f794d308b42 files/digest-e2fsprogs-1.32-r2 67 MD5 3307c0c209b26bf447ff2840b7118862 files/digest-e2fsprogs-1.33 67 +MD5 db361eb5cdf39ddae07e9f794d308b42 files/digest-e2fsprogs-1.32-r2 67 MD5 0b77829b4c6500ac9722143384ddda95 files/e2fsprogs-1.27ea-0.8.21.diff 15214 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316 +MD5 7132680b05198a0243c858f660c1a231 e2fsprogs-1.32-r2.ebuild 2319 +MD5 37bef5e28edb37aab6dde27b78ab3aed e2fsprogs-1.33.ebuild 2382 +MD5 6254c9f6e16ecd87ffdeed82eb4c6f87 ChangeLog 3864 diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild index c06863006861..d1f3613e5dd9 100644 --- a/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild +++ b/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild @@ -1,45 +1,38 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild,v 1.7 2003/06/21 21:19:39 drobbins Exp $ - -IUSE="nls" +# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32-r2.ebuild,v 1.8 2003/06/24 20:34:16 vapier Exp $ inherit eutils -S="${WORKDIR}/${P}" DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips" SLOT="0" LICENSE="GPL-2" +IUSE="nls" #debianutils is for 'readlink' -DEPEND="virtual/glibc +DEPEND="${DEPEND} + virtual/glibc nls? ( sys-devel/gettext ) sys-apps/debianutils sys-apps/texinfo" - RDEPEND="virtual/glibc" src_unpack() { unpack ${A} - # Fix a cosmetic error in mk_cmds's help output. cd ${S}; epatch ${FILESDIR}/${P}-mk_cmds-cosmetic.patch } src_compile() { - local myconf="" - - use nls \ - && myconf="--enable-nls" \ - || myconf="--disable-nls" - - econf --enable-dynamic-e2fsck \ + econf \ + --enable-dynamic-e2fsck \ --enable-elf-shlibs \ - ${myconf} || die + `use_enable nls` \ + || die # Parallel make sometimes fails MAKEOPTS="-j1" emake || die @@ -110,4 +103,3 @@ src_install() { insinto /usr/share/ss doins ct_c.awk } - diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild index dc82164450d9..31e976d1f220 100644 --- a/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild +++ b/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild @@ -1,31 +1,26 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild,v 1.3 2003/06/21 21:19:39 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.33.ebuild,v 1.4 2003/06/24 20:34:16 vapier Exp $ -IUSE="nls" +inherit eutils -S="${WORKDIR}/${P}" DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" KEYWORDS="x86 amd64" SLOT="0" LICENSE="GPL-2" +IUSE="nls" #debianutils is for 'readlink' -DEPEND="virtual/glibc +DEPEND="${DEPEND} + virtual/glibc nls? ( sys-devel/gettext ) sys-apps/debianutils sys-apps/texinfo" - RDEPEND="virtual/glibc" -#eutils has newdepend in it; needs to be inherited *after* DEPEND and RDEPEND -#are defined. - -inherit eutils - src_unpack() { unpack ${A} # Fix a cosmetic error in mk_cmds's help output. @@ -33,15 +28,11 @@ src_unpack() { } src_compile() { - local myconf="" - - use nls \ - && myconf="--enable-nls" \ - || myconf="--disable-nls" - - econf --enable-dynamic-e2fsck \ + econf \ + --enable-dynamic-e2fsck \ --enable-elf-shlibs \ - ${myconf} || die + `use_enable nls` \ + || die # Parallel make sometimes fails MAKEOPTS="-j1" emake || die @@ -113,4 +104,3 @@ src_install() { insinto /usr/share/ss doins ct_c.awk } - |