diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-06-30 16:20:29 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-06-30 16:20:29 +0000 |
| commit | 38063b0dcdea91cf73eeea7070b328b02de15d04 (patch) | |
| tree | 3fdf91dc04e98d34a0f0a82c50cdd7c28aeedd0a /app-shells | |
| parent | fixed gcc-4.7. compile, bug 423059; eapi=4 (diff) | |
| download | gentoo-2-38063b0dcdea91cf73eeea7070b328b02de15d04.tar.gz gentoo-2-38063b0dcdea91cf73eeea7070b328b02de15d04.tar.bz2 gentoo-2-38063b0dcdea91cf73eeea7070b328b02de15d04.zip | |
app-shells/sash: Fix for recent linux-headers, #423655
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/sash/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/sash/metadata.xml | 6 | ||||
| -rw-r--r-- | app-shells/sash/sash-3.7-r3.ebuild | 16 |
3 files changed, 18 insertions, 10 deletions
diff --git a/app-shells/sash/ChangeLog b/app-shells/sash/ChangeLog index ebb64f5f1b45..53111bbcc868 100644 --- a/app-shells/sash/ChangeLog +++ b/app-shells/sash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-shells/sash # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.48 2012/06/17 19:36:49 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.49 2012/06/30 16:20:29 jlec Exp $ + + 30 Jun 2012; Justin Lecher <jlec@gentoo.org> sash-3.7-r3.ebuild, + metadata.xml: + Fix for recent linux-headers, #423655 17 Jun 2012; Markus Meier <maekke@gentoo.org> sash-3.7-r3.ebuild: arm stable, bug #418451 diff --git a/app-shells/sash/metadata.xml b/app-shells/sash/metadata.xml index d9cd2cad66c2..91f4e72fb544 100644 --- a/app-shells/sash/metadata.xml +++ b/app-shells/sash/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer> -<email>maintainer-needed@gentoo.org</email> -</maintainer> + <maintainer> + <email>maintainer-needed@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/app-shells/sash/sash-3.7-r3.ebuild b/app-shells/sash/sash-3.7-r3.ebuild index 17ee7b81f1dc..f1e545688e37 100644 --- a/app-shells/sash/sash-3.7-r3.ebuild +++ b/app-shells/sash/sash-3.7-r3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r3.ebuild,v 1.8 2012/06/17 19:36:49 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r3.ebuild,v 1.9 2012/06/30 16:20:28 jlec Exp $ -EAPI="4" +EAPI=4 inherit eutils toolchain-funcs flag-o-matic DESCRIPTION="A small (static) UNIX Shell" -HOMEPAGE="http://www.canb.auug.org.au/~dbell/ http://dimavb.st.simbirsk.su/vlk/" +HOMEPAGE="http://www.canb.auug.org.au/~dbell/" SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz" LICENSE="freedist" @@ -15,16 +15,20 @@ SLOT="0" KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86" IUSE="static" -DEPEND="static? ( sys-libs/zlib[static-libs] ) +DEPEND=" + static? ( sys-libs/zlib[static-libs] ) !static? ( >=sys-libs/zlib-1.2.3 )" RDEPEND="!static? ( ${DEPEND} )" src_prepare() { epatch "${FILESDIR}"/sash-3.7-builtin.patch - sed -i \ + sed \ -e "s:-O3:${CFLAGS}:" \ - Makefile || die + -i Makefile || die + sed \ + -e 's:linux/ext2_fs.h:ext2fs/ext2_fs.h:g' \ + -i cmd_chattr.c || die } src_compile() { |