Bug 216057 - added back in missing API element.

Package-Manager: portage-2.1.5_rc5

4 files changed, 151 insertions, 2 deletions

diff --git a/sci-chemistry/openbabel/ChangeLog b/sci-chemistry/openbabel/ChangeLog
index 22ef8a868201..234f03226230 100644
--- a/sci-chemistry/openbabel/ChangeLog
+++ b/sci-chemistry/openbabel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/openbabel
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.14 2008/03/01 17:50:03 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.15 2008/04/21 05:52:31 cryos Exp $
+
+*openbabel-2.2.0_beta4-r1 (21 Apr 2008)
+
+  21 Apr 2008; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/openbabel-2.2.0_beta4-obconversion_api_fix.diff,
+  +openbabel-2.2.0_beta4-r1.ebuild:
+  Bug 216057 - added back in missing API element.
 
 *openbabel-2.2.0_beta4 (01 Mar 2008)
 
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index dcc864a464fc..654a46fcb89e 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -1,3 +1,4 @@
+AUX openbabel-2.2.0_beta4-obconversion_api_fix.diff 3729 RMD160 56b58a8eeabad1f24f35056f339533ba22372941 SHA1 6a3741bbe8517687c9da6017a427868ac5cbc4aa SHA256 790ff6821debb8958bbb89fcd2ff5015207c91a5568ac4a19aba37a39ada64c7
 DIST openbabel-2.0.2.tar.gz 2712813 RMD160 3fee81f9d7c1605b36fa22d0676bfb9c18500443 SHA1 48ae2579c55d57d1a357825f498fc4091b6b30b4 SHA256 f85e600fad398df63290690e0e8d62e02d37ead941bc0d5bc8de5e44a01c7de3
 DIST openbabel-2.1.0.tar.gz 6559619 RMD160 c096f71f110c2fbcd4c0f113afb68f46d0818011 SHA1 5f2614442091cbe791a43dd967885935749a3406 SHA256 3cce3bad0990c59221f7b25f159096f69c87429725d479673748a36f52fa9da7
 DIST openbabel-2.1.1.tar.gz 6149509 RMD160 c8f462c92a109344e1cfc215be169ae0889a092d SHA1 57146b146cf163a184f6470d7af1453dcb39a89a SHA256 2e36ac296d60ca2b296743e766b8180d11c18eaa46c09808abeb28934e64fbe5
@@ -5,6 +6,7 @@ DIST openbabel-2.2.0b4-20080301-r2299.tar.gz 5792440 RMD160 3f12dd2239d84aeccd19
 EBUILD openbabel-2.0.2.ebuild 665 RMD160 fbd69ae436f693862b1066ff6903e2e1dea8c54d SHA1 0ff0c203786fcfcd8f23d304b1888398dc0e9516 SHA256 e3014ff0b7e4ee0b3871e0124c21118a7ce3ff2f7174adb467b179416c7556db
 EBUILD openbabel-2.1.0.ebuild 688 RMD160 c5a89ccfe902c709fecc5701a56cb2e32ba36c28 SHA1 c911cc6fa2f17e388003d865f9979aefd3b0976b SHA256 649cb712cba6a70de3667d2921f072c04fd3c7f207cf403af78cfa73b2d482d0
 EBUILD openbabel-2.1.1.ebuild 688 RMD160 d29c59351d5b242b4270f9e571b8cebf76353d62 SHA1 0f8c8a4880a1d5d1a22a53ee867888ea7672489e SHA256 f9a6532d202046f3134b03470ded2a65004e4c6a4c5afd25f2bda4ccccca23ac
+EBUILD openbabel-2.2.0_beta4-r1.ebuild 860 RMD160 cad07fd3e9d96c7a67c4355e6178402d809e725b SHA1 200c0c1b4eea304b53641ac6d70508aefedf9575 SHA256 e9f463ceb7fbfab79b84154c7a1c17d4d7a584d453a0d5db062e28256247095a
 EBUILD openbabel-2.2.0_beta4.ebuild 748 RMD160 8ed2fea08f292ba6a7fcb056a8ef29365503fdb2 SHA1 f47f68dad590c9a97c2d76f7d1f8aebc2f6138c5 SHA256 9260a35743fd3579e891ec15d821c93fa9c9993e0d1e08c84a9e44945a84b510
-MISC ChangeLog 2987 RMD160 4aa3ac7997514a10b5ec9427ec413ab1ad1ceb22 SHA1 ed75b3647de66a3ec34ba1f917efd662a75fe5ea SHA256 2b090588d81dfe10479aafc88e429cceb401f2b38cc2860cc898c20d329ed837
+MISC ChangeLog 3225 RMD160 0ce67be4ebfdc713c995bcb6fb30d022425fd6c4 SHA1 69302d08a11646380552c498f5e94b6c1d6679cd SHA256 6fc2adb7c68d0d2df12de9255875129eb46a34f9873698d4dc5c436add0a4a3c
 MISC metadata.xml 490 RMD160 443b08385246148cc37ad53df59658eabcb07cf3 SHA1 4a031d5b463dbcc4fea187c155f4771ee57683fc SHA256 dba1cb37e8e79e9816a15bcad3ceeffd991572ddad57ad58607ebb110a79b5a5
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
new file mode 100644
index 000000000000..14aa4a0fa21f
--- /dev/null
+++ b/sci-chemistry/openbabel/files/openbabel-2.2.0_beta4-obconversion_api_fix.diff
@@ -0,0 +1,110 @@
+--- 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.2.0_beta4-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.2.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..49a06562c914
--- /dev/null
+++ b/sci-chemistry/openbabel/openbabel-2.2.0_beta4-r1.ebuild
@@ -0,0 +1,30 @@
+# 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_beta4-r1.ebuild,v 1.1 2008/04/21 05:52:31 cryos Exp $
+
+inherit eutils
+
+DESCRIPTION="Open Babel interconverts file formats used in molecular modeling"
+SRC_URI="mirror://sourceforge/openbabel/${PN}-2.2.0b4-20080301-r2299.tar.gz"
+HOMEPAGE="http://openbabel.sourceforge.net/"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+RDEPEND="!sci-chemistry/babel"
+
+S=${WORKDIR}/${PN}-2.2.0b4
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-obconversion_api_fix.diff"
+}
+
+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
+}