dev-libs/libbulletml: EAPI-7 bump, https

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
index f7e9bfbab9b174896dfa805bc867d2b5e8f11910..2cbbda199f4bf1077491d893902bb74f73f89082 100644 (file)
--- a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
@@ -1,5 +1,5 @@
---- src/calc.yy
-+++ src/calc.yy
+--- a/calc.yy
++++ b/calc.yy
 @@ -8,6 +8,7 @@
  
  #include <cmath>
@@ -8,8 +8,8 @@
  
  #include <vector>
  #include <sstream>
---- src/tinyxml/tinyxml.h
-+++ src/tinyxml/tinyxml.h
+--- a/tinyxml/tinyxml.h
++++ b/tinyxml/tinyxml.h
 @@ -28,6 +28,8 @@
  #include <string>\r
  #include <stdio.h>\r
@@ -19,8 +19,8 @@
  \r
  class TiXmlDocument;\r
  class TiXmlElement;\r
---- src/tinyxml/tinyxmlparser.cpp
-+++ src/tinyxml/tinyxmlparser.cpp
+--- a/tinyxml/tinyxmlparser.cpp
++++ b/tinyxml/tinyxmlparser.cpp
 @@ -24,6 +24,7 @@
  \r
  #include "tinyxml.h"\r

diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
index 47e0dc411ac9920e7f70b0900ccdd04cdcdbbcb3..ab94deaf7c5f6009d40a1c1ec5cf69177bb08f59 100644 (file)
--- a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
@@ -1,5 +1,5 @@
---- calc.yy.old        2011-05-18 12:26:38.701666366 +0200
-+++ calc.yy    2011-05-18 12:27:43.020672135 +0200
+--- a/calc.yy  2011-05-18 12:26:38.701666366 +0200
++++ b/calc.yy  2011-05-18 12:27:43.020672135 +0200
 @@ -17,7 +17,7 @@
  #include "formula.h"
  #include "formula-variables.h"

diff --git a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
index 62b2ec3e1b7d835745380f8a7cbc2be39fb796fa..045879e2c0f53287a0fed34be481e885f44bd595 100644 (file)
--- a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
+++ b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A Library of Bullet Markup Language"
-HOMEPAGE="http://shinh.skr.jp/libbulletml/index_en.html"
-SRC_URI="http://shinh.skr.jp/libbulletml/${P}.tar.bz2"
+HOMEPAGE="https://shinh.skr.jp/libbulletml/index_en.html"
+SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -16,11 +15,12 @@ IUSE=""
 DEPEND="dev-libs/boost"
 RDEPEND=${DEPEND}
 
-S=${WORKDIR}/${PN#lib}/src
+PATCHES=( "${FILESDIR}"/${P}-gcc4{3,6}.patch )
+
+S="${WORKDIR}"/${PN#lib}/src
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-gcc43.patch \
-               "${FILESDIR}"/${P}-gcc46.patch
+       default
        rm -r boost || die
 
        # don't override the system-wide flags