From d0d03c803de0dec7ff83fa8af17ff1de70847c35 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 1 Jul 2010 08:16:21 +0000 Subject: Fixed allignment.patch part II (Portage version: 2.2_rc67/cvs/Linux x86_64) --- sci-libs/mmdb/ChangeLog | 8 +++- sci-libs/mmdb/files/1.21-allignment.patch | 64 ++++--------------------------- sci-libs/mmdb/mmdb-1.21-r1.ebuild | 48 ----------------------- sci-libs/mmdb/mmdb-1.21-r2.ebuild | 48 +++++++++++++++++++++++ 4 files changed, 63 insertions(+), 105 deletions(-) delete mode 100644 sci-libs/mmdb/mmdb-1.21-r1.ebuild create mode 100644 sci-libs/mmdb/mmdb-1.21-r2.ebuild (limited to 'sci-libs') diff --git a/sci-libs/mmdb/ChangeLog b/sci-libs/mmdb/ChangeLog index 435e39c27816..40aecae6b0ab 100644 --- a/sci-libs/mmdb/ChangeLog +++ b/sci-libs/mmdb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/mmdb # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmdb/ChangeLog,v 1.8 2010/07/01 07:07:35 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmdb/ChangeLog,v 1.9 2010/07/01 08:16:21 jlec Exp $ + +*mmdb-1.21-r2 (01 Jul 2010) + + 01 Jul 2010; Justin Lecher -mmdb-1.21-r1.ebuild, + +mmdb-1.21-r2.ebuild: + Fix pkg-config file 01 Jul 2010; Justin Lecher files/1.21-allignment.patch: Fixed allignment.patch diff --git a/sci-libs/mmdb/files/1.21-allignment.patch b/sci-libs/mmdb/files/1.21-allignment.patch index 970982314810..edc4cc44b785 100644 --- a/sci-libs/mmdb/files/1.21-allignment.patch +++ b/sci-libs/mmdb/files/1.21-allignment.patch @@ -1,13 +1,7 @@ diff --git a/src/file_.cpp b/src/file_.cpp -index 4071886..a50e2ad 100644 +index 4071886..6bfa648 100644 --- a/src/file_.cpp +++ b/src/file_.cpp -@@ -1,4 +1,4 @@ --// $Id: 1.21-allignment.patch,v 1.2 2010/07/01 07:07:35 jlec Exp $ -+// $Id: 1.21-allignment.patch,v 1.2 2010/07/01 07:07:35 jlec Exp $ - // ================================================================= - // - // CCP4 Coordinate Library: support of coordinate-related @@ -347,10 +347,10 @@ int i; if (i>0) sleep ( 1 ); #endif @@ -22,15 +16,9 @@ index 4071886..a50e2ad 100644 } #ifndef _MVS diff --git a/src/machine_.h b/src/machine_.h -index 2e81264..c658981 100644 +index 2e81264..7b18675 100644 --- a/src/machine_.h +++ b/src/machine_.h -@@ -1,4 +1,4 @@ --// $Id: 1.21-allignment.patch,v 1.2 2010/07/01 07:07:35 jlec Exp $ -+// $Id: 1.21-allignment.patch,v 1.2 2010/07/01 07:07:35 jlec Exp $ - // ================================================================= - // - // CCP4 Coordinate Library: support of coordinate-related @@ -127,8 +127,12 @@ # define CALL_LIKE_VMS 1 @@ -92,15 +80,9 @@ index 2e81264..c658981 100644 # error Unknown machine!!! diff --git a/src/mmdb_atom.h b/src/mmdb_atom.h -index 45049c8..672e11a 100644 +index 45049c8..5d0af2a 100644 --- a/src/mmdb_atom.h +++ b/src/mmdb_atom.h -@@ -1,4 +1,4 @@ --// $Id: 1.21-allignment.patch,v 1.2 2010/07/01 07:07:35 jlec Exp $ -+// $Id: 1.21-allignment.patch,v 1.2 2010/07/01 07:07:35 jlec Exp $ - // ================================================================= - // - // CCP4 Coordinate Library: support of coordinate-related @@ -290,7 +290,7 @@ class CAtom : public CUDData { void CalcAtomStatistics ( RSAtomStat AS ); realtype GetDist2 ( PCAtom a ); @@ -111,15 +93,9 @@ index 45049c8..672e11a 100644 // GetCosine(a1,a2) calculates cosine of angle a1-this-a2, diff --git a/src/mmdb_chain.cpp b/src/mmdb_chain.cpp -index a6f66c2..1fa165b 100644 +index a6f66c2..24baa37 100644 --- a/src/mmdb_chain.cpp +++ b/src/mmdb_chain.cpp -@@ -1,4 +1,4 @@ --// $Id: 1.21-allignment.patch,v 1.2 2010/07/01 07:07:35 jlec Exp $ -+// $Id: 1.21-allignment.patch,v 1.2 2010/07/01 07:07:35 jlec Exp $ - // ================================================================= - // - // CCP4 Coordinate Library: support of coordinate-related @@ -672,7 +672,8 @@ int i,k,sN; i = 0; sN = 1; @@ -131,15 +107,9 @@ index a6f66c2..1fa165b 100644 while ((i> ${T}/mmdb.pc <<- EOF - prefix="${EPREFIX}" - exec_prefix=\$prefix - libdir=\$prefix/$(get_libdir) - includedir=\$prefix/include - - Name: ${PN} - Description: Macromolecular coordinate library - Version: ${PV} - Requires: - Conflicts: - Libs: -L\${libdir} -lmmdb - Cflags: -I\${includedir} - - EOF - - insinto /usr/$(get_libdir)/pkgconfig - doins ${T}/mmdb.pc || die -} diff --git a/sci-libs/mmdb/mmdb-1.21-r2.ebuild b/sci-libs/mmdb/mmdb-1.21-r2.ebuild new file mode 100644 index 000000000000..a1a1cbfb914b --- /dev/null +++ b/sci-libs/mmdb/mmdb-1.21-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmdb/mmdb-1.21-r2.ebuild,v 1.1 2010/07/01 08:16:21 jlec Exp $ + +EAPI="3" + +inherit autotools eutils + +DESCRIPTION="The Coordinate Library is designed to assist CCP4 developers in working with coordinate files" +HOMEPAGE="http://www.ebi.ac.uk/~keb/cldoc/" +SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +DEPEND="!> ${T}/mmdb.pc <<- EOF + prefix=${EPREFIX} + exec_prefix=\$prefix + libdir=\$prefix/$(get_libdir) + includedir=\$prefix/include + + Name: ${PN} + Description: Macromolecular coordinate library + Version: ${PV} + Requires: + Conflicts: + Libs: -L\${libdir} -lmmdb + Cflags: -I\${includedir} + + EOF + + insinto /usr/$(get_libdir)/pkgconfig + doins ${T}/mmdb.pc || die +} -- cgit v1.2.3-65-gdbad