Fix sed on *FLAGS from : to |

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64
author: Justin Lecher <jlec@gentoo.org> 2011-06-28 19:30:30 +0000
committer: Justin Lecher <jlec@gentoo.org> 2011-06-28 19:30:30 +0000
commit: c62359df6733fc971d156dea5461b9fe99881dfe (patch)
tree: abf791acd784d81602632903a9aed5e2f1de118b /sci-libs/cbflib
parent: Remove acl from use.mask, bug 372249 (diff)
download: historical-c62359df6733fc971d156dea5461b9fe99881dfe.tar.gz
historical-c62359df6733fc971d156dea5461b9fe99881dfe.tar.bz2
historical-c62359df6733fc971d156dea5461b9fe99881dfe.zip
5 files changed, 50 insertions, 36 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/Manifest b/sci-libs/cbflib/Manifest
index 45488bad6739..fb68450378a9 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 0.8.1-Makefile.patch 1382 RMD160 79a344ee3654403ade4ddbc1a3bd1133f47e4e79 SHA1 7311cdafc01881555403cafb62e09a4f467f3e22 SHA256 92b3108840d2ccf7392ac24db52bb86fed7a9561cb3db9ccbf29e6c4e9e76cc5
 AUX 0.9.0-Makefile.patch 3091 RMD160 d976bb6fab07ffb5fa982b84f0c2d02c940c69ca SHA1 0b14f223cf4af87856acdb053918d5a0484987e3 SHA256 361cd3c6a906f6bfe2761196e459aec2735e4bb539586b5589b1a8d2d35a02b4
 AUX 0.9.0-python.patch 574 RMD160 ef346c4d28421d1559c6f6d972f0f6b9089740be SHA1 fe142637682924bdd39aadc86b81028babd9c99b SHA256 632e0820b0479a7f267d34ba8709b8bc828c58e3d63b45d6b78c9c86af0f4594
 DIST CBFlib-0.8.1.tar.gz 3532726 RMD160 e2b82cabaeb7da07ca547822f7b3ac8871f6f467 SHA1 2b17b7f79c0e32e0a5a22aa43c93c170296e6d02 SHA256 197660197d0f861da26764d67fcf92fd75cfa3ad1da30df02fb33e6d67c6b5e3
 DIST CBFlib-0.9.0_14Feb10.tar.gz 4456643 RMD160 a90052a584f982df456a9426d07f2fd506c55ef4 SHA1 b05ab50f6a9f921444f3bb27cbbc72797be4f41f SHA256 7f79d0de9b07b6c544f2da1bf66b83460006fca75a36eacbbc8f839694ff2eba
-EBUILD cbflib-0.8.1-r7.ebuild 1713 RMD160 445382061e05d8ba3b58e3190dc28995e84511ca SHA1 164fe4af2ee529e74dd9efd9a41e869ade5102fa SHA256 cc750d237d7c0f9b3261c4a6a95dbf81251971d349e46a01581de3780e507840
-EBUILD cbflib-0.9.0-r3.ebuild 2276 RMD160 abd0c82eae80e7dcc99bcd3efd4f3c7affb0ce29 SHA1 1f56eef54afbf11176bdeec1829cd360b1385bee SHA256 86019f0a99468cd4ea3a850d02a9df357235e083ecac8caa3a530f44885c049d
-MISC ChangeLog 2993 RMD160 950c3a4b809e7edbd7a2747371845fbc7a99252d SHA1 1e4178411e323cff3a64e69dbdc2184f7c0186d1 SHA256 b601ae8d92d6ca718959d43ff81698421ce8fa445556d79c59fde438e57f3e37
-MISC metadata.xml 872 RMD160 65a3873ad810c058abebf748ebdbc29a0da05e2d SHA1 df579c7f63aff50d1e3877013bf62e6ae9a2a438 SHA256 60351f0290d2947caddf8470468b8891dd63dd00545af8099859bde40eda1f49
+EBUILD cbflib-0.8.1-r7.ebuild 1710 RMD160 daa1735afca4919337a9f076962cafec525a52c7 SHA1 e27bf35eb9a1a1b3234de1fad32b9359f40c0dd7 SHA256 b971f1569b4dd0e17b2c987ad5e368dd2dbd793d8faa7de94e09934440083690
+EBUILD cbflib-0.9.0-r3.ebuild 2271 RMD160 96d3f7e5b6f911d9cc278c2b62d5eebe86b09dca SHA1 c67f578a55708a55cd9d83b973bcbbe0be118be2 SHA256 d1a7397dd31afbff0384e28b08dd3876f688e089aa744b0e3827cbf5a7f24a6b
+MISC ChangeLog 3135 RMD160 2608c465406e1c214ee4a38d6dcc29c5e32d4728 SHA1 2a48c40441ea461a080b4a6c76ca200ea8dc89fe SHA256 5e97d76a8c0ae8b9bc3d64cb6b4ce2eb6bf28f95853019a6db874fc46ba7fd94
+MISC metadata.xml 876 RMD160 5eeb9243491d73e4d8a5631e32204c15d7506f9e SHA1 a0e2e09ae6369fd0d6fb4e6dd49cb4bac18f5d15 SHA256 071da33ed31350cc15bac652a2ff5382bd2b27c1b8edc4b13baa8d5076f91eea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREKAAYFAk4KK+AACgkQgAnW8HDreRYzWwCdHvYzaU38pf+IxADKk7unj2yY
++W8AnRSxIbwguwmC34EMNRoIGGXeMO2M
+=e6py
+-----END PGP SIGNATURE-----
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
author	Justin Lecher <jlec@gentoo.org>	2011-06-28 19:30:30 +0000
committer	Justin Lecher <jlec@gentoo.org>	2011-06-28 19:30:30 +0000
commit	c62359df6733fc971d156dea5461b9fe99881dfe (patch)
tree	abf791acd784d81602632903a9aed5e2f1de118b /sci-libs/cbflib
parent	Remove acl from use.mask, bug 372249 (diff)
download	historical-c62359df6733fc971d156dea5461b9fe99881dfe.tar.gz historical-c62359df6733fc971d156dea5461b9fe99881dfe.tar.bz2 historical-c62359df6733fc971d156dea5461b9fe99881dfe.zip