Fix sed on *FLAGS from : to |, EAPI bump

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

4 files changed, 28 insertions, 23 deletions

diff --git a/sci-biology/stride/ChangeLog b/sci-biology/stride/ChangeLog
index 9935c2305739..5c7fea7ad1fc 100644
--- a/sci-biology/stride/ChangeLog
+++ b/sci-biology/stride/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/stride
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/stride/ChangeLog,v 1.10 2010/04/25 11:25:18 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/stride/ChangeLog,v 1.11 2011/06/29 05:42:13 jlec Exp $
+
+  29 Jun 2011; Justin Lecher <jlec@gentoo.org> stride-20011129.ebuild,
+  stride-20011129-r1.ebuild:
+  Fix sed on *FLAGS from : to |, EAPI bump
 
   07 Mar 2010; Justin Lecher <jlec@gentoo.org>
   stride-20011129-r1.ebuild:
diff --git a/sci-biology/stride/Manifest b/sci-biology/stride/Manifest
index c72f1c578c79..9a3ee43392b4 100644
--- a/sci-biology/stride/Manifest
+++ b/sci-biology/stride/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX stride-LDFLAGS.patch 280 RMD160 f4f594bfab2ac2151bbf5d679c8ead73dec11f3f SHA1 f4eb9952b4e54d9ec2610cf7444c31efd23562e1 SHA256 3b2387a0649d76a24d5e9ed611ec3da43ca7844a3ce3704ebbad63699328fd10
 DIST stride-20060723-update.patch.bz2 5621 RMD160 c5ac88dcff4d074adb18fb09cc39f37e6b95d82a SHA1 a57e7780d2dd44ce53e72dac35ed4d8539a83d10 SHA256 8d48627c294b4efba67acba10fba47b20c0a8d5f7e06c2775a2d7eaaa0aa7b81
 DIST stride.tar.gz 56441 RMD160 6fdcf064f37ce44529446a043b56663af9765054 SHA1 f85cca717c79200bf33fa3a80323ccd9da471669 SHA256 d272700bccd046199f6ea1faed31a2a2662a7d5f13b7663736a1818ac18c87b9
-EBUILD stride-20011129-r1.ebuild 1031 RMD160 db5afd4e9038a5fe6d7f6878652028dc97792ea8 SHA1 945f3d8d2dcf85d1348c09ff2763d27e4d904bed SHA256 489faf1095cbe79d37ee7da6979aeced596ed9343417fa3b4e71fdba64bed8db
-EBUILD stride-20011129.ebuild 980 RMD160 fc84a14c8f84f9671760d21c3d377c25c7316349 SHA1 f7c1489ef127bb9f2af6927f912783605939fa18 SHA256 f6aca22f6f3801a10798aa8db7eebfb6e537c961f29c22390dd7830a2f33749f
-MISC ChangeLog 1607 RMD160 e378c4f763eabd8398afd7fd76511489cecbd946 SHA1 12f348170666004e4b844b5279136e636a633b9a SHA256 4f298f63ebe1a9644dd676b390883c1205f78fa6b67fbe205e5c13d2f82caaf7
+EBUILD stride-20011129-r1.ebuild 973 RMD160 7a06d6427e1ffe121242ece70c58d247715b505d SHA1 39cb645b45cf20508860824d68bbd9d49c203c1e SHA256 cc1b3982ed761169f3fd0a0694e168d857150128194a13ae5167bbf0534af85f
+EBUILD stride-20011129.ebuild 961 RMD160 279e76f72b0d53be93bbebf857672476ea4029bc SHA1 3faccc572d4a6df56e8807452a957be86dad5412 SHA256 4c9260c3a25221f42bfd652b295610c95563d3deb50c40680bdef33a6b50867c
+MISC ChangeLog 1751 RMD160 c8390618d7a078d16a30b0610773681d8a69733d SHA1 41a195a0d0f080c8c24f09551121936fcb5af19b SHA256 eb5d13ce8e7c18a2cc323b882ed9cfdcbb94a371e37931a5d4ec51fa3ebd3ef8
 MISC metadata.xml 262 RMD160 346498c47da29f51b223d00c4d2cdf35e69386f6 SHA1 fdf6cc4c581eb3162837bfde3334803445332489 SHA256 732b5b7d88c83d3b0bd0be860f512d9545353e2a2c89b873da8c2217394736c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkvUJqQACgkQgAnW8HDreRYjnQCgq9EQxvVUZNcpOZbbOBRWlwgD
-HMoAnRLJsfFDVoDHAF3ysO4JKEPHGqwm
-=PCm8
+iEYEAREKAAYFAk4Kuz8ACgkQgAnW8HDreRZkGQCgpT4PbDJ6FucJ6UHyusJhFjqZ
+ljYAoIElB+XwjiZS8HT0wSBfY89gSwe1
+=rJIa
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/stride/stride-20011129-r1.ebuild b/sci-biology/stride/stride-20011129-r1.ebuild
index 75992f7db596..254f7399e461 100644
--- a/sci-biology/stride/stride-20011129-r1.ebuild
+++ b/sci-biology/stride/stride-20011129-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/stride/stride-20011129-r1.ebuild,v 1.3 2010/03/07 09:10:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/stride/stride-20011129-r1.ebuild,v 1.4 2011/06/29 05:42:13 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A program for protein secondary structure assignment from atomic coordinates."
+DESCRIPTION="Protein secondary structure assignment from atomic coordinates"
 HOMEPAGE="http://webclu.bio.wzw.tum.de/stride/"
 SRC_URI="ftp://ftp.ebi.ac.uk/pub/software/unix/${PN}/src/${PN}.tar.gz
 	mirror://gentoo/${PN}-20060723-update.patch.bz2"
@@ -21,14 +21,15 @@ S="${WORKDIR}"
 src_prepare() {
 	# this patch updates the source to the most recent
 	# version which was kindly provided by the author
-	epatch "${DISTDIR}/${PN}-20060723-update.patch.bz2"
-	epatch "${FILESDIR}"/${PN}-LDFLAGS.patch
+	epatch \
+		"${DISTDIR}/${PN}-20060723-update.patch.bz2" \
+		"${FILESDIR}"/${PN}-LDFLAGS.patch
 
 	# fix makefile
-	sed -e "/^CC/s:gcc -g:$(tc-getCC) ${CFLAGS}:" -i Makefile || \
+	sed -e "/^CC/s|gcc -g|$(tc-getCC) ${CFLAGS}|" -i Makefile || \
 		die "Failed to fix Makefile"
 }
 
 src_install() {
-	dobin ${PN} || die "Failed to install stride binary"
+	dobin ${PN}
 }
diff --git a/sci-biology/stride/stride-20011129.ebuild b/sci-biology/stride/stride-20011129.ebuild
index 700bb3d838f6..136c7c1e8c16 100644
--- a/sci-biology/stride/stride-20011129.ebuild
+++ b/sci-biology/stride/stride-20011129.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/stride/stride-20011129.ebuild,v 1.7 2009/11/06 02:50:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/stride/stride-20011129.ebuild,v 1.8 2011/06/29 05:42:13 jlec Exp $
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A program for protein secondary structure assignment from atomic coordinates."
-LICENSE="as-is"
+DESCRIPTION="Protein secondary structure assignment from atomic coordinates"
 HOMEPAGE="http://webclu.bio.wzw.tum.de/stride/"
 SRC_URI="ftp://ftp.ebi.ac.uk/pub/software/unix/${PN}/src/${PN}.tar.gz
 	mirror://gentoo/${PN}-20060723-update.patch.bz2"
 
 SLOT="0"
+LICENSE="as-is"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
@@ -25,7 +25,7 @@ src_unpack() {
 	epatch "${DISTDIR}/${PN}-20060723-update.patch.bz2"
 
 	# fix makefile
-	sed -e "/^CC/s:gcc -g:$(tc-getCC) ${CFLAGS}:" -i Makefile || \
+	sed -e "/^CC/s|gcc -g|$(tc-getCC) ${CFLAGS}|" -i Makefile || \
 		die "Failed to fix Makefile"
 }