Drop useless fix-includes patch as this breaks with gcc-4.6+ (--disable-shared is not a valid flag). Depend on lib packages being built with USE=static-libs when we are built with USE=static #384333 by Guenther Brunthaler.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

5 files changed, 27 insertions, 34 deletions

diff --git a/app-shells/sash/ChangeLog b/app-shells/sash/ChangeLog
index 9f06902f93a7..5d55ef2a0c07 100644
--- a/app-shells/sash/ChangeLog
+++ b/app-shells/sash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/sash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.41 2011/09/01 16:21:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.42 2011/09/25 19:43:27 vapier Exp $
+
+  25 Sep 2011; Mike Frysinger <vapier@gentoo.org>
+  -files/sash-3.6-fix-includes.patch, files/sash-3.6-readline.patch,
+  sash-3.7-r1.ebuild, sash-3.7-r3.ebuild:
+  Drop useless fix-includes patch as this breaks with gcc-4.6+
+  (--disable-shared is not a valid flag). Depend on lib packages being built
+  with USE=static-libs when we are built with USE=static #384333 by Guenther
+  Brunthaler.
 
 *sash-3.7-r3 (01 Sep 2011)
 
diff --git a/app-shells/sash/files/sash-3.6-fix-includes.patch b/app-shells/sash/files/sash-3.6-fix-includes.patch
deleted file mode 100644
index 3be0c0fcf589..000000000000
--- a/app-shells/sash/files/sash-3.6-fix-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN sash-3.6.orig/Makefile sash-3.6/Makefile
---- sash-3.6.orig/Makefile	2002-07-22 01:24:47.000000000 +0200
-+++ sash-3.6/Makefile	2003-10-17 14:25:00.306848712 +0200
-@@ -21,7 +21,7 @@
- 	-DHAVE_BSD_MOUNT=$(HAVE_BSD_MOUNT) \
- 	-DMOUNT_TYPE=$(MOUNT_TYPE)
- 
--LDFLAGS = -static -s
-+LDFLAGS = --disable-shared -static -s
- LIBS = -lz
-
diff --git a/app-shells/sash/files/sash-3.6-readline.patch b/app-shells/sash/files/sash-3.6-readline.patch
index 2d2d2a4d51a8..79749e48f944 100644
--- a/app-shells/sash/files/sash-3.6-readline.patch
+++ b/app-shells/sash/files/sash-3.6-readline.patch
@@ -1,6 +1,5 @@
-diff -ruN sash-3.6/Makefile sash-3.6.readline/Makefile
---- sash-3.6/Makefile	2003-10-17 14:25:00.306848712 +0200
-+++ sash-3.6.readline/Makefile	2003-10-17 14:27:34.529403320 +0200
+--- sash-3.6/Makefile
++++ sash-3.6/Makefile
 @@ -19,10 +19,11 @@
  	-DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \
  	-DHAVE_LINUX_MOUNT=$(HAVE_LINUX_MOUNT) \
@@ -9,15 +8,14 @@ diff -ruN sash-3.6/Makefile sash-3.6.readline/Makefile
 +	-DMOUNT_TYPE=$(MOUNT_TYPE) \
 +	-DHAVE_READLINE
  
- LDFLAGS = --disable-shared -static -s
+ LDFLAGS = -static -s
 -LIBS = -lz
 +LIBS = -lz -lreadline -lncurses
  
  
  BINDIR = /bin
-diff -ruN sash-3.6/sash.c sash-3.6.readline/sash.c
---- sash-3.6/sash.c	2002-07-22 00:55:28.000000000 +0200
-+++ sash-3.6.readline/sash.c	2003-10-17 14:26:26.184793280 +0200
+--- sash-3.6/sash.c
++++ sash-3.6/sash.c
 @@ -384,6 +384,201 @@
  static	void	usage(void);
  static	Alias *	findAlias(const char * name);
diff --git a/app-shells/sash/sash-3.7-r1.ebuild b/app-shells/sash/sash-3.7-r1.ebuild
index 9bc17f53c879..501056b23706 100644
--- a/app-shells/sash/sash-3.7-r1.ebuild
+++ b/app-shells/sash/sash-3.7-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r1.ebuild,v 1.3 2011/02/06 22:02:34 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r1.ebuild,v 1.4 2011/09/25 19:43:27 vapier Exp $
+
+EAPI="3"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -13,25 +15,21 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="readline"
 
-DEPEND=">=sys-libs/zlib-1.2.3
+DEPEND="|| ( <sys-libs/zlib-1.2.5.1-r2 sys-libs/zlib[static-libs] )
 	readline? (
 		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
+		sys-libs/ncurses[static-libs]
 	)"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}"/sash-3.6-fix-includes.patch
+src_prepare() {
 	epatch "${FILESDIR}"/sash-3.7-builtin.patch
 	use readline && epatch "${FILESDIR}"/sash-3.6-readline.patch
 
 	sed -i \
 		-e "s:-O3:${CFLAGS}:" \
 		-e "/^LDFLAGS /s: -s$: ${LDFLAGS}:" \
-		Makefile || die "sed failed"
+		Makefile || die
 }
 
 src_compile() {
diff --git a/app-shells/sash/sash-3.7-r3.ebuild b/app-shells/sash/sash-3.7-r3.ebuild
index 52b00c43b5f8..a424ab07459d 100644
--- a/app-shells/sash/sash-3.7-r3.ebuild
+++ b/app-shells/sash/sash-3.7-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.1 2011/09/01 16:21:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r3.ebuild,v 1.2 2011/09/25 19:43:27 vapier Exp $
 
-EAPI=4
+EAPI="4"
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,16 +15,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static"
 
-DEPEND=">=sys-libs/zlib-1.2.3"
-RDEPEND=""
+DEPEND="static? ( sys-libs/zlib[static-libs] )
+	!static? ( >=sys-libs/zlib-1.2.3 )"
+RDEPEND="!static? ( ${DEPEND} )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/sash-3.6-fix-includes.patch
 	epatch "${FILESDIR}"/sash-3.7-builtin.patch
 
 	sed -i \
 		-e "s:-O3:${CFLAGS}:" \
-		Makefile || die "sed failed"
+		Makefile || die
 }
 
 src_compile() {