Fix sed on *FLAGS from : to |

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

4 files changed, 36 insertions, 32 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index 2642e2671e9e..33496b3ddeb8 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/cbflib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.18 2011/06/28 15:53:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.19 2011/06/28 19:30:30 jlec Exp $
+
+  28 Jun 2011; Justin Lecher <jlec@gentoo.org> cbflib-0.8.1-r7.ebuild,
+  cbflib-0.9.0-r3.ebuild, metadata.xml:
+  Fix sed on *FLAGS from : to |
 
   28 Jun 2011; Brent Baude <ranger@gentoo.org> cbflib-0.9.0-r3.ebuild:
   Marking cbflib-0.9.0-r3 ppc for bug 352065
diff --git a/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild b/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild
index 4580116ec7e8..4282bcf103dd 100644
--- a/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild
+++ b/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild,v 1.3 2011/06/21 15:41:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild,v 1.4 2011/06/28 19:30:30 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
-inherit eutils fortran-2 flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic fortran-2 toolchain-funcs
 
 MY_P1="CBFlib-${PV}"
 MY_P2="CBFlib_${PV}"
 
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files."
+DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
 HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
 #BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz"
@@ -37,15 +37,15 @@ src_prepare(){
 	append-cflags -D_USE_XOPEN_EXTENDED
 
 	sed \
-		-e "s:^CC.*$:CC = $(tc-getCC):" \
-		-e "s:^C++.*$:C++ = $(tc-getCXX):" \
-		-e "s:C++:CXX:g" \
-		-e "s:^CFLAGS.*$:CFLAGS = ${CFLAGS}:" \
-		-e "s:^F90C.*$:F90C = $(tc-getFC):" \
-		-e "s:^F90FLAGS.*$:F90FLAGS = ${FFLAGS}:" \
-		-e "s:^SOLDFLAGS.*$:SOLDFLAGS = -shared ${LDFLAGS}:g" \
-		-e "s: /bin: ${EPREFIX}/bin:g" \
-		-e "s:/usr:${EPREFIX}/usr:g" \
+		-e "s|^CC.*$|CC = $(tc-getCC)|" \
+		-e "s|^C++.*$|C++ = $(tc-getCXX)|" \
+		-e "s|C++|CXX|g" \
+		-e "s|^CFLAGS.*$|CFLAGS = ${CFLAGS}|" \
+		-e "s|^F90C.*$|F90C = $(tc-getFC)|" \
+		-e "s|^F90FLAGS.*$|F90FLAGS = ${FFLAGS}|" \
+		-e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \
+		-e "s| /bin| ${EPREFIX}/bin|g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
 		-i Makefile || die
 }
 
diff --git a/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild b/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild
index 38e1786db9ed..3a87c235ecc5 100644
--- a/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild
+++ b/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild,v 1.6 2011/06/28 15:53:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild,v 1.7 2011/06/28 19:30:30 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils eutils fortran-2 flag-o-matic toolchain-funcs
+inherit distutils eutils flag-o-matic fortran-2 toolchain-funcs
 
 PYTHON_MODNAME="pycbf.py"
 MY_P1="CBFlib-${PV}"
 MY_P2="CBFlib_${PV}"
 
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files."
+DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
 HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
 #BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P1}_14Feb10.tar.gz"
@@ -45,15 +45,15 @@ src_prepare(){
 	append-cflags -D_USE_XOPEN_EXTENDED
 
 	sed \
-		-e "s:^CC.*$:CC = $(tc-getCC):" \
-		-e "s:^C++.*$:C++ = $(tc-getCXX):" \
-		-e "s:C++:CXX:g" \
-		-e "s:^CFLAGS.*$:CFLAGS = ${CFLAGS}:" \
-		-e "s:^F90C.*$:F90C = $(tc-getFC):" \
-		-e "s:^F90FLAGS.*$:F90FLAGS = ${FFLAGS}:" \
-		-e "s:^SOLDFLAGS.*$:SOLDFLAGS = -shared ${LDFLAGS}:g" \
-		-e "s: /bin: ${EPREFIX}/bin:g" \
-		-e "s:/usr:${EPREFIX}/usr:g" \
+		-e "s|^CC.*$|CC = $(tc-getCC)|" \
+		-e "s|^C++.*$|C++ = $(tc-getCXX)|" \
+		-e "s|C++|CXX|g" \
+		-e "s|^CFLAGS.*$|CFLAGS = ${CFLAGS}|" \
+		-e "s|^F90C.*$|F90C = $(tc-getFC)|" \
+		-e "s|^F90FLAGS.*$|F90FLAGS = ${FFLAGS}|" \
+		-e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \
+		-e "s| /bin| ${EPREFIX}/bin|g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
 		-i Makefile || die
 }
 
diff --git a/sci-libs/cbflib/metadata.xml b/sci-libs/cbflib/metadata.xml
index afa56f9ab719..2ba1757cce1f 100644
--- a/sci-libs/cbflib/metadata.xml
+++ b/sci-libs/cbflib/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<herd>sci</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 CBFLIB is a library of ANSI-C functions providing a simple mechanism
 for accessing Crystallographic Binary Files (CBF files) and Image-supporting
 CIF (imgCIF) files. The CBFLIB API is loosely based on the CIFPARSE API for