diff options
| -rw-r--r-- | sci-chemistry/openbabel/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-chemistry/openbabel/files/openbabel-2.2.0_beta4-obconversion_api_fix.diff | 110 | ||||
| -rw-r--r-- | sci-chemistry/openbabel/openbabel-2.1.1.ebuild | 20 | ||||
| -rw-r--r-- | sci-chemistry/openbabel/openbabel-2.2.0.ebuild | 28 | ||||
| -rw-r--r-- | sci-chemistry/openbabel/openbabel-2.2.2.ebuild | 59 |
5 files changed, 7 insertions, 218 deletions
diff --git a/sci-chemistry/openbabel/ChangeLog b/sci-chemistry/openbabel/ChangeLog index 37791b49f830..de58167ae250 100644 --- a/sci-chemistry/openbabel/ChangeLog +++ b/sci-chemistry/openbabel/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-chemistry/openbabel # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.28 2009/08/01 15:22:51 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.29 2009/08/01 21:27:55 cryos Exp $ + + 01 Aug 2009; Marcus D. Hanwell <cryos@gentoo.org> -openbabel-2.1.1.ebuild, + -openbabel-2.2.0.ebuild, + -files/openbabel-2.2.0_beta4-obconversion_api_fix.diff, + -openbabel-2.2.2.ebuild: + Removed old versions that are no longer required. *openbabel-2.2.3 (01 Aug 2009) diff --git a/sci-chemistry/openbabel/files/openbabel-2.2.0_beta4-obconversion_api_fix.diff b/sci-chemistry/openbabel/files/openbabel-2.2.0_beta4-obconversion_api_fix.diff deleted file mode 100644 index 14aa4a0fa21f..000000000000 --- a/sci-chemistry/openbabel/files/openbabel-2.2.0_beta4-obconversion_api_fix.diff +++ /dev/null @@ -1,110 +0,0 @@ ---- include/openbabel/obconversion.h 2008-02-29 14:06:19.000000000 -0500 -+++ include/openbabel/obconversion.h 2008-04-20 20:17:14.000000000 -0400 -@@ -49,6 +49,9 @@ - - OBERROR extern OBMessageHandler obErrorLog; - -+ typedef std::map<const char*,OBFormat*,CharPtrLess > FMapType; -+ typedef FMapType::iterator Formatpos; -+ - //************************************************* - /// @brief Class to convert from one format to another. - // Class introduction in obconversion.cpp -@@ -75,7 +78,7 @@ - static OBFormat* FormatFromMIME(const char* MIME); - - ///Repeatedly called to recover available Formats --// static bool GetNextFormat(Formatpos& itr, const char*& str,OBFormat*& pFormat); -+ static bool GetNextFormat(Formatpos& itr, const char*& str,OBFormat*& pFormat); - //@} - - /// @name Information -@@ -142,7 +145,7 @@ - { return &OptionsArray[opttyp];}; - - ///@brief Set an option of specified type, with optional text -- void AddOption(const char* opt, Option_type opttyp, const char* txt=NULL); -+ void AddOption(const char* opt, Option_type opttyp=OUTOPTIONS, const char* txt=NULL); - - bool RemoveOption(const char* opt, Option_type optype); - -@@ -279,7 +282,7 @@ - - protected: - bool SetStartAndEnd(); --// static FMapType& FormatsMap();///<contains ID and pointer to all OBFormat classes -+ static FMapType& FormatsMap();///<contains ID and pointer to all OBFormat classes - // static FMapType& FormatsMIMEMap();///<contains MIME and pointer to all OBFormat classes - typedef std::map<std::string,int> OPAMapType; - static OPAMapType& OptionParamArray(Option_type typ); - ---- src/obconversion.cpp 2008-02-29 14:06:05.000000000 -0500 -+++ src/obconversion.cpp 2008-04-20 20:18:28.000000000 -0400 -@@ -324,6 +324,42 @@ - return count; - } - -+ FMapType& OBConversion::FormatsMap() -+ { -+ static FMapType* fm = new FMapType; -+ return *fm; -+ } -+ -+ bool OBConversion::GetNextFormat(Formatpos& itr, const char*& str,OBFormat*& pFormat) -+ { -+ pFormat = NULL; -+ if(str==NULL) -+ itr = FormatsMap().begin(); -+ else -+ itr++; -+ if(itr == FormatsMap().end()) -+ { -+ str=NULL; -+ pFormat=NULL; -+ return false; -+ } -+ static string s; -+ s =itr->first; -+ pFormat = itr->second; -+ if(pFormat) -+ { -+ string description(pFormat->Description()); -+ s += " -- "; -+ s += description.substr(0,description.find('\n')); -+ } -+ -+ if(pFormat->Flags() & NOTWRITABLE) s+=" [Read-only]"; -+ if(pFormat->Flags() & NOTREADABLE) s+=" [Write-only]"; -+ -+ str = s.c_str(); -+ return true; -+ } -+ - ////////////////////////////////////////////////////// - /// Sets the formats from their ids, e g CML. - /// If inID is NULL, the input format is left unchanged. Similarly for outID -@@ -486,7 +522,7 @@ - if(!ret) - { - //error or termination request: terminate unless -- // -e option requested and sucessfully can skip past current object -+ // -e option requested and successfully can skip past current object - if(!IsOption("e", GENOPTIONS) || pInFormat->SkipObjects(0,this)!=1) - break; - } -@@ -1093,7 +1129,14 @@ - - //INPUT - if(FileList.empty()) -- pIs = NULL; -+ { -+ pIs = NULL; -+ if(HasMultipleOutputFiles) -+ { -+ obErrorLog.ThrowError(__FUNCTION__,"Cannot use multiple output files without an input file", obError); -+ return 0; -+ } -+ } - else - { - if(FileList.size()>1 || OutputFileName.substr(0,2)=="*.") diff --git a/sci-chemistry/openbabel/openbabel-2.1.1.ebuild b/sci-chemistry/openbabel/openbabel-2.1.1.ebuild deleted file mode 100644 index 31c08d70b38c..000000000000 --- a/sci-chemistry/openbabel/openbabel-2.1.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.1.1.ebuild,v 1.2 2008/07/06 21:00:29 markusle Exp $ - -DESCRIPTION="Open Babel interconverts file formats used in molecular modeling" -SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz" -HOMEPAGE="http://openbabel.sourceforge.net/" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" -RDEPEND="!sci-chemistry/babel" - -src_install () { - make DESTDIR="${D}" install || die "make install failed." - dodoc AUTHORS ChangeLog NEWS README THANKS - cd doc - dohtml *.html *.png - dodoc *.inc README* *.inc *.mol2 -} diff --git a/sci-chemistry/openbabel/openbabel-2.2.0.ebuild b/sci-chemistry/openbabel/openbabel-2.2.0.ebuild deleted file mode 100644 index 9886092c905a..000000000000 --- a/sci-chemistry/openbabel/openbabel-2.2.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.0.ebuild,v 1.2 2008/11/02 07:46:39 vapier Exp $ - -inherit eutils - -DESCRIPTION="interconverts file formats used in molecular modeling" -HOMEPAGE="http://openbabel.sourceforge.net/" -SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -RDEPEND="!sci-chemistry/babel - dev-libs/libxml2" -DEPEND="${RDEPEND} - dev-libs/boost - dev-lang/perl" - -src_install() { - emake DESTDIR="${D}" install || die "make install failed." - dodoc AUTHORS ChangeLog NEWS README THANKS - cd doc - dohtml *.html *.png - dodoc *.inc README* *.inc *.mol2 -} diff --git a/sci-chemistry/openbabel/openbabel-2.2.2.ebuild b/sci-chemistry/openbabel/openbabel-2.2.2.ebuild deleted file mode 100644 index 2a4177ca0d1d..000000000000 --- a/sci-chemistry/openbabel/openbabel-2.2.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.2.ebuild,v 1.2 2009/07/20 21:47:17 mr_bones_ Exp $ - -EAPI=1 - -inherit eutils - -DESCRIPTION="interconverts file formats used in molecular modeling" -HOMEPAGE="http://openbabel.sourceforge.net/" -SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz" - -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="doc" - -RDEPEND="!sci-chemistry/babel - >=dev-libs/libxml2-2.6.5 - sys-libs/zlib" - -DEPEND="${RDEPEND} - >=dev-libs/boost-1.33.1 - dev-lang/perl - doc? ( app-doc/doxygen )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-2.2.0-doxyfile.patch" -} - -src_compile() { - econf \ - --enable-static \ - || die "econf failed" - emake || die "emake failed" - if use doc ; then - emake docs || die "make docs failed" - fi -} - -src_test() { - emake check || die "make check failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS - cd doc - dohtml *.html *.png - dodoc *.inc README* *.inc *.mol2 - if use doc ; then - dodir /usr/share/doc/${PF}/API/html - insinto /usr/share/doc/${PF}/API/html - cd API/html - doins * - fi -} |