diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2003-10-18 11:16:54 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2003-10-18 11:16:54 +0000 |
| commit | a7a439c22393d1cd24c98a0a11a7d76902511c76 (patch) | |
| tree | 9790436c8c8461eb0fefe1edefe65857a4840012 /app-shells/sash | |
| parent | version bump, bug #28085 (diff) | |
| download | gentoo-2-a7a439c22393d1cd24c98a0a11a7d76902511c76.tar.gz gentoo-2-a7a439c22393d1cd24c98a0a11a7d76902511c76.tar.bz2 gentoo-2-a7a439c22393d1cd24c98a0a11a7d76902511c76.zip | |
Fixed includes patch to remove bootstrapper breakage.
Diffstat (limited to 'app-shells/sash')
| -rw-r--r-- | app-shells/sash/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/sash/Manifest | 12 | ||||
| -rw-r--r-- | app-shells/sash/files/sash-3.6-fix-includes.patch | 30 | ||||
| -rw-r--r-- | app-shells/sash/sash-3.6.ebuild | 3 |
4 files changed, 13 insertions, 38 deletions
diff --git a/app-shells/sash/ChangeLog b/app-shells/sash/ChangeLog index 3ddd4a6cd664..44d6d1ad8183 100644 --- a/app-shells/sash/ChangeLog +++ b/app-shells/sash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-shells/sash # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.13 2003/10/18 09:14:03 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.14 2003/10/18 11:16:44 plasmaroo Exp $ + + 18 Oct 2003; <plasmaroo@gentoo.org> files/sash-3.6-fix-includes.patch: + Fixed includes patch to get rid of bootstrapping-breakage: e2fsprogs + DEPEND should now be un-necessary. 18 Oct 2003; Jon Portnoy <avenj@gentoo.org> sash-3.6.ebuild : Fixed DEPEND to include sys-fs/e2fsprogs. diff --git a/app-shells/sash/Manifest b/app-shells/sash/Manifest index 4c053c690773..8b7973930668 100644 --- a/app-shells/sash/Manifest +++ b/app-shells/sash/Manifest @@ -1,13 +1,13 @@ -MD5 c720c7fc85f17d0bb248d3f852e61179 ChangeLog 1682 +MD5 8a0b2b6ad694efac9e1d4cb180ca3dc9 ChangeLog 1868 MD5 c835d6bcda25294f07b47c3a5445981f sash-3.4-r3.ebuild 1260 -MD5 a74427dac8d9e624a3c36cfbfacc80f9 sash-3.4-r4.ebuild 1186 MD5 bee2de1101df8fc490298192d6db9431 sash-3.4-r5.ebuild 1179 -MD5 5542c905897dffbee876b03c253494d2 sash-3.6.ebuild 1020 -MD5 3a34f0b1b1dbc1357fa1fcd94e48d624 files/Makefile 570 +MD5 0a2600d315ba4e67825096ff8b8b37c3 sash-3.6.ebuild 1006 +MD5 a74427dac8d9e624a3c36cfbfacc80f9 sash-3.4-r4.ebuild 1186 MD5 6fe20649cd07eb0aa8884df7a1749e47 files/digest-sash-3.4-r3 127 +MD5 c0a4b54f51097cb6d1e76b0f0df2d938 files/digest-sash-3.6 59 MD5 6fe20649cd07eb0aa8884df7a1749e47 files/digest-sash-3.4-r4 127 MD5 6fe20649cd07eb0aa8884df7a1749e47 files/digest-sash-3.4-r5 127 MD5 570237f86f81b58c68835104a03da8dc files/sash-3.4-gentoo.diff 7087 -MD5 c0a4b54f51097cb6d1e76b0f0df2d938 files/digest-sash-3.6 59 -MD5 f8d9ad8cd4969ec1fd93a69b43b50026 files/sash-3.6-fix-includes.patch 990 +MD5 3a34f0b1b1dbc1357fa1fcd94e48d624 files/Makefile 570 +MD5 77ad7e30c6247ea375666b47b414651f files/sash-3.6-fix-includes.patch 321 MD5 5a2ff5736c99f27196c276c933f08c08 files/sash-3.6-readline.patch 7269 diff --git a/app-shells/sash/files/sash-3.6-fix-includes.patch b/app-shells/sash/files/sash-3.6-fix-includes.patch index 1537ffb1b1fd..41f5ffff6e2d 100644 --- a/app-shells/sash/files/sash-3.6-fix-includes.patch +++ b/app-shells/sash/files/sash-3.6-fix-includes.patch @@ -8,32 +8,4 @@ diff -ruN sash-3.6.orig/Makefile sash-3.6/Makefile -LDFLAGS = -static -s +LDFLAGS = -all-static -s LIBS = -lz - - -diff -ruN sash-3.6.orig/cmd_chattr.c sash-3.6/cmd_chattr.c ---- sash-3.6.orig/cmd_chattr.c 2002-03-08 08:21:03.000000000 +0100 -+++ sash-3.6/cmd_chattr.c 2003-10-17 14:24:47.559786560 +0200 -@@ -12,7 +12,7 @@ - - #include <sys/ioctl.h> - #include <sys/types.h> --#include <linux/ext2_fs.h> -+#include <ext2fs/ext2_fs.h> - - #include "sash.h" - -diff -ruN sash-3.6.orig/cmds.c sash-3.6/cmds.c ---- sash-3.6.orig/cmds.c 2002-07-22 00:28:19.000000000 +0200 -+++ sash-3.6/cmds.c 2003-10-17 14:24:31.013302008 +0200 -@@ -17,11 +17,6 @@ - #include <utime.h> - #include <errno.h> - --#if HAVE_LINUX_MOUNT --#include <linux/fs.h> --#endif -- -- - void - do_echo(int argc, const char ** argv) - { + diff --git a/app-shells/sash/sash-3.6.ebuild b/app-shells/sash/sash-3.6.ebuild index 588298b098fd..84c44cd14f8c 100644 --- a/app-shells/sash/sash-3.6.ebuild +++ b/app-shells/sash/sash-3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.6.ebuild,v 1.3 2003/10/18 09:14:03 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.6.ebuild,v 1.4 2003/10/18 11:16:44 plasmaroo Exp $ IUSE="readline" @@ -13,7 +13,6 @@ LICENSE="freedist" DEPEND="virtual/glibc >=sys-libs/zlib-1.1.4 - sys-fs/e2fsprogs readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )" RDEPEND="" |