summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-30 16:20:29 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-30 16:20:29 +0000
commit81be06e0b966efcc153b75be8f74435645d1aea4 (patch)
tree015d44a3aae796cfddc8b8fa6e0a96bae0e9662d /app-shells
parentfixed gcc-4.7. compile, bug 423059; eapi=4 (diff)
downloadhistorical-81be06e0b966efcc153b75be8f74435645d1aea4.tar.gz
historical-81be06e0b966efcc153b75be8f74435645d1aea4.tar.bz2
historical-81be06e0b966efcc153b75be8f74435645d1aea4.zip
app-shells/sash: Fix for recent linux-headers, #423655
Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/sash/ChangeLog6
-rw-r--r--app-shells/sash/Manifest15
-rw-r--r--app-shells/sash/metadata.xml6
-rw-r--r--app-shells/sash/sash-3.7-r3.ebuild16
4 files changed, 26 insertions, 17 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/Manifest b/app-shells/sash/Manifest
index 7ceb7eca487d..3229372bbe2b 100644
--- a/app-shells/sash/Manifest
+++ b/app-shells/sash/Manifest
@@ -1,17 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX sash-3.6-readline.patch 7225 RMD160 764b56c16d19496a7907d51954bc56964bb48f65 SHA1 9e3376ece5686b2dac998f486401e51194f86b32 SHA256 b6401d3912352992aa7d39cab22435632d455f3b5a1f269d907c5b207fb7480f
AUX sash-3.7-builtin.patch 465 RMD160 c0061ff9f1a5aad5bc69d68cbd522f06ebf73f8a SHA1 4cb38daff63bbc0c74efdcdc47eb774f6dd044cf SHA256 ce968bfe95a2444fae473f678e4394b4acea2b7510b48ba63b554d2537de1bf1
DIST sash-3.7.tar.gz 50337 RMD160 d89a4798e451215f8505d5033b07f1cf173d3823 SHA1 3dd22cb5387966184dbd5404319a9cac1d39192e SHA256 352726adb9736ba5a9b459d5c8a7d7c3b2c36cc99363adccc25a8a991d719c7f
EBUILD sash-3.7-r1.ebuild 1102 RMD160 e436a41cbe815752f5189bc121c99f9386507464 SHA1 96cb97f0e0e7b5ece4cf317be944c32beefd846f SHA256 ac7b764eccc9cff5c0dd5a58f69001fc518199747ad9c9a52560413295002b3d
-EBUILD sash-3.7-r3.ebuild 993 RMD160 90254decf5d292987d421304c1aab42312815de8 SHA1 3251292fafec5f1dcab7d66aeaf717557a52a7db SHA256 5e11ac8b3178d9e2300059a6c70473ad35812df0db394f8f16df8bf77fa8d917
-MISC ChangeLog 5993 RMD160 fd3a8ef722df7ea24d0fa46c4084165b9487cd52 SHA1 e8b188821fbeb1d34d1b469ec2556d3ae255e7a1 SHA256 87189fe1a15d94f0d00d97cd95f2028285da5abb74b7ae1365c5da738eb8a97a
-MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
+EBUILD sash-3.7-r3.ebuild 1035 RMD160 757bcedc26440abc07ed0156b477e3617c6bb031 SHA1 4e4a1ea09af8e40f18cef93eb57812b27fb3cd00 SHA256 840155bd477b9b79b84685379e77e6585793d8e8f020e8f1fd6b1f15d015e11b
+MISC ChangeLog 6115 RMD160 48b644f290363816abf3faf36ce9938103d71deb SHA1 3509d4fcdddcce701f7ac14b6639c2147b356407 SHA256 45876d24762f1b17c5d86396c2488e79235ed172657f834e3586acb760afa337
+MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
-iEYEARECAAYFAk/eMrUACgkQkKaRLQcq0GJYDACghkhNFbsA0G9wQXJuaCgagHne
-z0oAoIfZ3306ri7hEMGCuT6X6Z434pzn
-=UWAc
+iEYEAREKAAYFAk/vJ1IACgkQgAnW8HDreRaS7wCdECn7yEBiShUssQ+eWNBhV99z
+ngMAn2zG44WPngyyIw7eGaiwqVjDjDIo
+=IToq
-----END PGP SIGNATURE-----
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() {