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.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

6 files changed, 34 insertions, 44 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/Manifest b/app-shells/sash/Manifest
index 94b9dcd6285d..066b392443b7 100644
--- a/app-shells/sash/Manifest
+++ b/app-shells/sash/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX sash-3.6-fix-includes.patch 334 RMD160 1dc9eabed8c403d583608692077af056745101b8 SHA1 f44c8307485b479396cb9b3c9c9fa202427b6711 SHA256 6c96aa180fac902ab54b338e172b9b6608c0406f6e1740c580c8e3184461375b
-AUX sash-3.6-readline.patch 7510 RMD160 42f25f4d5f3fc7fb36da580eafbf66dbdab9ab06 SHA1 2e181cc6517bcb190fd143e78e55ba903ea66508 SHA256 804325d211f536382046385b6635736519cdfda84ad543d278b26c75eb81e4d1
+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 1139 RMD160 54a082e5bdeefbb82137f790bc5518a040687a15 SHA1 9f44b0db72d462790611bdff0f335cd7a69997b5 SHA256 8617fdd5ca4d210b7da595dbd64ae44c55b8054e117ec7117a89f859d93853b4
-EBUILD sash-3.7-r3.ebuild 988 RMD160 e14c2c3d4c4fd1bc77b26905a27d9b509ee100e8 SHA1 af0db4ab4e19845a08cefc42d0d5ed8763f5a368 SHA256 8faece6fcc5ca0f74855bf6fc5da06af175cf332cf75011ffeea4f965d717b1e
-MISC ChangeLog 4983 RMD160 e66b242ca71daf129a385adc5b90f1ea94a4da92 SHA1 e2c8c61d2f59adbd02b353ec43020dc7c1ca2bc0 SHA256 e2cff967a5f2dad1ea9da0375e56ed98717eda0613557ebd40ffa6766fd48c54
+EBUILD sash-3.7-r1.ebuild 1102 RMD160 e436a41cbe815752f5189bc121c99f9386507464 SHA1 96cb97f0e0e7b5ece4cf317be944c32beefd846f SHA256 ac7b764eccc9cff5c0dd5a58f69001fc518199747ad9c9a52560413295002b3d
+EBUILD sash-3.7-r3.ebuild 999 RMD160 15c1919f50202cb9f0b4260d39c4bde1cd4fb9f2 SHA1 a5ce90b7bf78f80650d7ff4ede71020c0c5ad587 SHA256 662690a7edcf1dd30e5341aa537e4fe7cd6f81a33ded2b5fe34b2b8c7ad2dd91
+MISC ChangeLog 5373 RMD160 ebb9bae76730f5f27ec80c9e0dcc60989507a76e SHA1 d617c0deb89f764983e1097addeafa33e426201e SHA256 454f762d0d2183dd37abaeb98ad13526942f6d70d42baea420d5fb24cac81381
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59AdAACgkQfXuS5UK5QB1KsAP+I/hUq0FlgQ+GkxbxJSpbEXr4
-WrDchTik8hZXp90HavksPHnQ+zOFOZXnQDV+/x7w539a/gIZoN1O5bVgIT7E1TiI
-cOeHWRCOnECoBe2FVK6D0m6MoDTwNohSQd8pYwa027z7EZdcyoct5QeEr250bGmy
-sscKYekRonVdXKiWzKQ=
-=NHOe
+iF4EAREIAAYFAk5/hGUACgkQaC/OocHi7JbofwD+JrlbMBpPvEzlO6EfKEOh/LP8
+bUnMPsVIwibfvBvahe0A/2mFzpHb+NIG42elzPzCLovj3LXJ0VpsjHET+ZAOnUZQ
+=ts3q
 -----END PGP SIGNATURE-----
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() {