[gentoo-commits] proj/sci:master commit in: sci-biology/tigr-foundation-libs/files/, sci-biology/tigr-foundation-libs/

[gentoo-commits] proj/sci:master commit in: sci-biology/tigr-foundation-libs/files/, sci-biology/tigr-foundation-libs/

[Andrew Ammerlaan]

commit:     824c4fcb5104717c78984bc2aff7dcfa784f62b0
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Mar  6 15:06:45 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Mar  6 15:06:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=824c4fcb

sci-biology/tigr-foundation-libs: EAPI bump

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../files/TigrFoundation-all-patches.patch         | 24 +++++++++++-----------
 .../tigr-foundation-libs-2.0-r1.ebuild             | 16 +++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sci-biology/tigr-foundation-libs/files/TigrFoundation-all-patches.patch b/sci-biology/tigr-foundation-libs/files/TigrFoundation-all-patches.patch
index 57ad86e2e..459ae96d1 100644
--- a/sci-biology/tigr-foundation-libs/files/TigrFoundation-all-patches.patch
+++ b/sci-biology/tigr-foundation-libs/files/TigrFoundation-all-patches.patch
@@ -1,5 +1,5 @@
---- /tmp/autoEditor-1.20/TigrFoundation-2.0/ConfigFile.cc.old	2010-12-04 17:07:50.000000000 +0100
-+++ /tmp/autoEditor-1.20/TigrFoundation-2.0/ConfigFile.cc	2010-12-04 17:07:25.000000000 +0100
+--- a/ConfigFile.cc	2010-12-04 17:07:50.000000000 +0100
++++ b/ConfigFile.cc	2010-12-04 17:07:25.000000000 +0100
 @@ -33,6 +33,7 @@
   *  different values.
   */
@@ -8,8 +8,8 @@
  #include "ConfigFile.hh"
  
  //! Constructor
---- /tmp/autoEditor-1.20/TigrFoundation-2.0/Logger.hh.old	2010-12-04 17:20:19.000000000 +0100
-+++ /tmp/autoEditor-1.20/TigrFoundation-2.0/Logger.hh	2010-12-04 17:20:49.000000000 +0100
+--- a/Logger.hh	2010-12-04 17:20:19.000000000 +0100
++++ b/Logger.hh	2010-12-04 17:20:49.000000000 +0100
 @@ -15,6 +15,7 @@
  #include <list>
  #include <string>
@@ -18,8 +18,8 @@
  
  #include <time.h>
  #include <pwd.h>
---- /tmp/autoEditor-1.20/TigrFoundation-2.0/OptionResult.hh.old	2010-12-04 17:21:35.000000000 +0100
-+++ /tmp/autoEditor-1.20/TigrFoundation-2.0/OptionResult.hh	2010-12-04 17:22:02.000000000 +0100
+--- a/OptionResult.hh	2010-12-04 17:21:35.000000000 +0100
++++ b/OptionResult.hh	2010-12-04 17:22:02.000000000 +0100
 @@ -12,6 +12,7 @@
  #define OPTIONRESULT_HH 1
  
@@ -28,8 +28,8 @@
  #include <map>
  #include "Exceptions.hh"
  
---- /tmp/autoEditor-1.20/TigrFoundation-2.0/Options.hh.old	2010-12-04 17:22:37.000000000 +0100
-+++ /tmp/autoEditor-1.20/TigrFoundation-2.0/Options.hh	2010-12-04 17:23:01.000000000 +0100
+--- a/Options.hh	2010-12-04 17:22:37.000000000 +0100
++++ b/Options.hh	2010-12-04 17:23:01.000000000 +0100
 @@ -11,6 +11,7 @@
  #ifndef OPTIONS_HH
  #define OPTIONS_HH 1
@@ -38,8 +38,8 @@
  #include <list>
  #include <map>
  #include <set>
---- /tmp/autoEditor-1.20/TigrFoundation-2.0/FileSystem.cc.old	2010-12-04 17:24:02.000000000 +0100
-+++ /tmp/autoEditor-1.20/TigrFoundation-2.0/FileSystem.cc	2010-12-04 17:24:12.000000000 +0100
+--- a/FileSystem.cc	2010-12-04 17:24:02.000000000 +0100
++++ b/FileSystem.cc	2010-12-04 17:24:12.000000000 +0100
 @@ -55,7 +55,7 @@
    {
      // Check to see if path was given
@@ -49,8 +49,8 @@
      
      if (end_of_path)
      {
---- /tmp/autoEditor-1.20/TigrFoundation-2.0/Options.cc.old	2010-12-04 17:24:53.000000000 +0100
-+++ /tmp/autoEditor-1.20/TigrFoundation-2.0/Options.cc	2010-12-04 17:25:15.000000000 +0100
+--- a/Options.cc	2010-12-04 17:24:53.000000000 +0100
++++ b/Options.cc	2010-12-04 17:25:15.000000000 +0100
 @@ -25,6 +25,7 @@
   *  written to stderr is prefixed with (stderr).
   */

diff --git a/sci-biology/tigr-foundation-libs/tigr-foundation-libs-2.0-r1.ebuild b/sci-biology/tigr-foundation-libs/tigr-foundation-libs-2.0-r1.ebuild
index 8c2b46567..a03a130c2 100644
--- a/sci-biology/tigr-foundation-libs/tigr-foundation-libs-2.0-r1.ebuild
+++ b/sci-biology/tigr-foundation-libs/tigr-foundation-libs-2.0-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="TIGR Foundation for C++"
 HOMEPAGE="https://sourceforge.net/projects/amos/"
@@ -15,16 +13,18 @@ SRC_URI="ftp://ftp.cbcb.umd.edu/pub/software/autoEditor/autoEditor-1.20.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-S="${WORKDIR}"/autoEditor-1.20/TigrFoundation-2.0
+S="${WORKDIR}/autoEditor-1.20/TigrFoundation-2.0"
+
+PATCHES=(
+	"${FILESDIR}/TigrFoundation-all-patches.patch"
+)
 
 src_prepare(){
-	epatch "${FILESDIR}"/TigrFoundation-all-patches.patch
 	sed -i "s:/export/usr/local:${ED}/usr:g" Makefile || die
 	default
 }
 
 src_install(){
-	emake install DESTDIR="${D}/${EPREFIX}"/usr # Makefile does not respect DESTDIR
+	emake install DESTDIR="${ED}/usr" # Makefile does not respect DESTDIR
 }