From fd8328d2370be92639dc7811fdd3e7b4be6d1bac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 1 Sep 2011 16:21:19 +0000 Subject: [PATCH] Remove readline USE flag and patch given that the patch itself is custom and not vanilla, and this is orphaned. Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- app-shells/sash/ChangeLog | 9 ++++++++- app-shells/sash/Manifest | 10 +++++----- .../{sash-3.7-r2.ebuild => sash-3.7-r3.ebuild} | 18 +++++------------- 3 files changed, 18 insertions(+), 19 deletions(-) rename app-shells/sash/{sash-3.7-r2.ebuild => sash-3.7-r3.ebuild} (64%) diff --git a/app-shells/sash/ChangeLog b/app-shells/sash/ChangeLog index f386c5acd5b6..9f06902f93a7 100644 --- a/app-shells/sash/ChangeLog +++ b/app-shells/sash/ChangeLog @@ -1,6 +1,13 @@ # 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.40 2011/08/29 06:26:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.41 2011/09/01 16:21:19 flameeyes Exp $ + +*sash-3.7-r3 (01 Sep 2011) + + 01 Sep 2011; Diego E. Pettenò -sash-3.7-r2.ebuild, + +sash-3.7-r3.ebuild: + Remove readline USE flag and patch given that the patch itself is custom and + not vanilla, and this is orphaned. 29 Aug 2011; Diego E. Pettenò sash-3.7-r2.ebuild: Fix building with GCC 4.6 by not passing broken LDFLAGS (bug #381005). Do not diff --git a/app-shells/sash/Manifest b/app-shells/sash/Manifest index 7f02d921c663..18f849df06ec 100644 --- a/app-shells/sash/Manifest +++ b/app-shells/sash/Manifest @@ -6,13 +6,13 @@ AUX sash-3.6-readline.patch 7510 RMD160 42f25f4d5f3fc7fb36da580eafbf66dbdab9ab06 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-r2.ebuild 1230 RMD160 d0e07acfa83ba275b17d225c2d78f024d0f17c44 SHA1 b165b33cb6b35c58a453fef07d6d3d279417eb67 SHA256 e47ad95990ebdabf44d92e638b87cf092fb5e52a6db525681c951bfb992d4448 -MISC ChangeLog 4738 RMD160 80754474a0402b9a2e5554599a5c53fd2c7cd452 SHA1 4a0dfb3fb10e6f5a76315844c38b12ba106e5aba SHA256 5e03b375fb3a4a5cb466d96421bbdbb11c7d107f4e722e48404ba2c5c0ba3ba6 +EBUILD sash-3.7-r3.ebuild 988 RMD160 e14c2c3d4c4fd1bc77b26905a27d9b509ee100e8 SHA1 af0db4ab4e19845a08cefc42d0d5ed8763f5a368 SHA256 8faece6fcc5ca0f74855bf6fc5da06af175cf332cf75011ffeea4f965d717b1e +MISC ChangeLog 4983 RMD160 e66b242ca71daf129a385adc5b90f1ea94a4da92 SHA1 e2c8c61d2f59adbd02b353ec43020dc7c1ca2bc0 SHA256 e2cff967a5f2dad1ea9da0375e56ed98717eda0613557ebd40ffa6766fd48c54 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5bMRgACgkQAiZjviIA2Xg55gCgsjuQgvOzN6Ttd+oZjC3Nn8wC -wMwAoL+prTcxk4qxbx4HGZkx8c3h7i5T -=Fh1Z +iEYEARECAAYFAk5fsO0ACgkQAiZjviIA2XirgACgnJ6/YnfCR7c9BPeLiBA7lR17 +J08AoJI4AGJBftwVtTPIXzHiExPullg+ +=ryTU -----END PGP SIGNATURE----- diff --git a/app-shells/sash/sash-3.7-r2.ebuild b/app-shells/sash/sash-3.7-r3.ebuild similarity index 64% rename from app-shells/sash/sash-3.7-r2.ebuild rename to app-shells/sash/sash-3.7-r3.ebuild index 685af94f9656..52b00c43b5f8 100644 --- a/app-shells/sash/sash-3.7-r2.ebuild +++ b/app-shells/sash/sash-3.7-r3.ebuild @@ -1,34 +1,26 @@ # 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-r2.ebuild,v 1.2 2011/08/29 06:26:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r3.ebuild,v 1.1 2011/09/01 16:21:19 flameeyes Exp $ EAPI=4 inherit eutils toolchain-funcs flag-o-matic -DESCRIPTION="A small static UNIX Shell with readline support" +DESCRIPTION="A small (static) UNIX Shell" HOMEPAGE="http://www.canb.auug.org.au/~dbell/ http://dimavb.st.simbirsk.su/vlk/" SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz" LICENSE="freedist" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="readline static" - -DEPEND=">=sys-libs/zlib-1.2.3 - readline? ( - >=sys-libs/readline-4.1 - sys-libs/ncurses - static? ( - || ( =sys-libs/ncurses-5.7-r4[static-libs] ) - ) - )" +IUSE="static" + +DEPEND=">=sys-libs/zlib-1.2.3" RDEPEND="" src_prepare() { epatch "${FILESDIR}"/sash-3.6-fix-includes.patch epatch "${FILESDIR}"/sash-3.7-builtin.patch - use readline && epatch "${FILESDIR}"/sash-3.6-readline.patch sed -i \ -e "s:-O3:${CFLAGS}:" \ -- 2.26.2